[infra] Reduce Fuchsia build set.
Change-Id: Iba59af7e031bafc375669e0ba3cc84081476e6e1 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/507720 Reviewed-by: Alexander Aprelev <aam@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
committed by
dart-scoped@luci-project-accounts.iam.gserviceaccount.com
parent
12a0b7994c
commit
2bf2ff5682
@@ -443,7 +443,6 @@ if (is_fuchsia) {
|
||||
test_binaries = [
|
||||
"dartvm",
|
||||
"dartaotruntime",
|
||||
"run_vm_tests",
|
||||
]
|
||||
|
||||
foreach(binary, test_binaries) {
|
||||
@@ -460,10 +459,7 @@ if (is_fuchsia) {
|
||||
"libffi_test_dynamic_library.so",
|
||||
"libffi_test_functions.so",
|
||||
]
|
||||
resource_files = [
|
||||
".dart_tool/package_config.json",
|
||||
"tools/addlatexhash.dart",
|
||||
]
|
||||
resource_files = [ ".dart_tool/package_config.json" ]
|
||||
resources = []
|
||||
foreach(file, library_files) {
|
||||
resources += [
|
||||
@@ -495,13 +491,7 @@ if (is_fuchsia) {
|
||||
|
||||
fuchsia_package("fuchsia_test_package") {
|
||||
testonly = true
|
||||
if (is_debug) {
|
||||
package_name = "dart_test_debug"
|
||||
} else if (is_release) {
|
||||
package_name = "dart_test_release"
|
||||
} else if (is_product) {
|
||||
package_name = "dart_test_product"
|
||||
}
|
||||
package_name = "dart_test"
|
||||
deps = []
|
||||
foreach(binary, test_binaries) {
|
||||
deps += [ ":${binary}_test_component" ]
|
||||
|
||||
@@ -24,9 +24,9 @@ class FuchsiaEmulator {
|
||||
assert(publisher == null);
|
||||
var args = <String>[
|
||||
"./build/fuchsia/test_env.py",
|
||||
"--out-dir=${_outDir(buildDir, mode)}",
|
||||
"--out-dir=$buildDir/gen/dart_test",
|
||||
"--device-spec=$arch-emu-large",
|
||||
"--packages=dart_test_$mode.far",
|
||||
"--packages=dart_test.far",
|
||||
"--logs-dir=${daemonIsolateDir!.path}",
|
||||
];
|
||||
if (arch == "arm64") {
|
||||
@@ -64,12 +64,12 @@ class FuchsiaEmulator {
|
||||
environmentOverrides.addAll(envs);
|
||||
return VMCommand(withEnv, [
|
||||
"./third_party/fuchsia/test_scripts/test/run_executable_test.py",
|
||||
"--test-name=fuchsia-pkg://fuchsia.com/dart_test_$mode#meta/$component",
|
||||
"--test-name=fuchsia-pkg://fuchsia.com/dart_test#meta/$component",
|
||||
// VmexResource not available in default hermetic realm
|
||||
// TODO(38752): Setup a Dart test realm.
|
||||
"--test-realm=/core/testing/system-tests",
|
||||
"--out-dir=${_outDir(buildDir, mode)}",
|
||||
"--package-deps=dart_test_$mode.far",
|
||||
"--out-dir=$buildDir/gen/dart_test",
|
||||
"--package-deps=dart_test.far",
|
||||
...arguments,
|
||||
], environmentOverrides);
|
||||
}
|
||||
@@ -103,10 +103,6 @@ class FuchsiaEmulator {
|
||||
}
|
||||
}
|
||||
|
||||
String _outDir(String buildDir, String mode) {
|
||||
return "$buildDir/gen/dart_test_$mode";
|
||||
}
|
||||
|
||||
static final FuchsiaEmulator _instance = _create();
|
||||
|
||||
static FuchsiaEmulator _create() {
|
||||
|
||||
@@ -1696,7 +1696,7 @@
|
||||
"script": "tools/build.py",
|
||||
"arguments": [
|
||||
"--os=fuchsia",
|
||||
"runtime"
|
||||
"fuchsia_test_package"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1730,7 +1730,7 @@
|
||||
"script": "tools/build.py",
|
||||
"arguments": [
|
||||
"--os=fuchsia",
|
||||
"runtime"
|
||||
"fuchsia_test_package"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user