Only build host tests if they're going to be run
Previously the recipes were always building host tests, which resulted
in the build_default builders building much more than just the
default ninja target (see attached bug).
Bug: 44396
Change-Id: Ida3da2758f8c2fbaaa03ab2ff80043a7cab444eb
diff --git a/recipe_modules/artifacts/examples/full.expected/basic.json b/recipe_modules/artifacts/examples/full.expected/basic.json
index f338f41..272e3e4 100644
--- a/recipe_modules/artifacts/examples/full.expected/basic.json
+++ b/recipe_modules/artifacts/examples/full.expected/basic.json
@@ -1515,38 +1515,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1659,7 +1627,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipe_modules/build/api.py b/recipe_modules/build/api.py
index a5ad375..22d0f92 100644
--- a/recipe_modules/build/api.py
+++ b/recipe_modules/build/api.py
@@ -694,6 +694,7 @@
board=build_spec.board,
product=build_spec.product,
collect_build_metrics=collect_build_metrics,
+ build_host_tests=build_spec.run_tests,
build_images=not build_spec.exclude_images,
archives_to_build=tuple(archives_to_build),
gcs_bucket=gcs_bucket,
@@ -713,6 +714,7 @@
board=None,
product=None,
collect_build_metrics=False,
+ build_host_tests=False,
build_images=True,
archives_to_build=(),
gcs_bucket=None):
@@ -734,6 +736,7 @@
board (str): A board to pass to GN to build
product (str): A product to pass to GN to build
collect_build_metrics (bool): Whether to collect build metrics.
+ build_host_tests (bool): Whether to build the host tests.
build_images (bool): Whether to build the basic images needed to boot
and test on fuchsia.
archives_to_build (seq(str)): A tuple of canonical names of archives to
@@ -777,6 +780,7 @@
board=board,
product=product,
collect_build_metrics=collect_build_metrics,
+ build_host_tests=build_host_tests,
build_images=build_images,
archives_to_build=archives_to_build,
gcs_bucket=gcs_bucket,
@@ -1054,7 +1058,8 @@
def _with_options(self, checkout_root, fuchsia_build_dir, build_type, target,
packages, universe_packages, variants, gn_args,
ninja_targets, board, product, collect_build_metrics,
- build_images, archives_to_build, gcs_bucket):
+ build_host_tests, build_images, archives_to_build,
+ gcs_bucket):
with self.m.step.nest('build fuchsia'):
gn_results = self.gen(
checkout_root=checkout_root,
@@ -1122,7 +1127,7 @@
build_images=build_images,
image_filter=image_filter,
archives_to_build=archives_to_build,
- build_host_tests=True,
+ build_host_tests=build_host_tests,
)
results = self.FuchsiaBuildResults(
diff --git a/recipe_modules/build/examples/full.expected/exclude_images.json b/recipe_modules/build/examples/full.expected/exclude_images.json
index 77ae400..4f94d4e 100644
--- a/recipe_modules/build/examples/full.expected/exclude_images.json
+++ b/recipe_modules/build/examples/full.expected/exclude_images.json
@@ -1243,38 +1243,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1377,8 +1345,7 @@
"-C",
"[START_DIR]/out/default",
"-j",
- "80",
- "path/on/disk/to/test"
+ "80"
],
"name": "build.build fuchsia.ninja.fuchsia",
"~followup_annotations": [
diff --git a/recipe_modules/build/examples/full.py b/recipe_modules/build/examples/full.py
index 3fd340b..e535cf0 100644
--- a/recipe_modules/build/examples/full.py
+++ b/recipe_modules/build/examples/full.py
@@ -144,7 +144,10 @@
gn_args=gn_args,
ninja_targets=ninja_targets,
board=board,
- run_tests=False,
+ # Trigger building of host tests for coverage.
+ # This is also a realistic combination of settings:
+ # we frequently exclude images when we're not running tests.
+ run_tests=not exclude_images,
product=product,
include_breakpad_symbols=include_breakpad_symbols,
include_symbol_archive=include_symbol_archive,
diff --git a/recipes/ffmpeg.expected/ci.json b/recipes/ffmpeg.expected/ci.json
index f721ecd..c464776 100644
--- a/recipes/ffmpeg.expected/ci.json
+++ b/recipes/ffmpeg.expected/ci.json
@@ -1434,38 +1434,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "arm64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "arm64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1575,8 +1543,7 @@
"arm64-profile-shared/libffmpeg.so",
"arm64-shared/libffmpeg.so",
"arm64-thinlto-shared/libffmpeg.so",
- "arm64-ubsan-shared/libffmpeg.so",
- "path/on/disk/to/test"
+ "arm64-ubsan-shared/libffmpeg.so"
],
"name": "arm64.build.build fuchsia.ninja.fuchsia",
"~followup_annotations": [
@@ -3496,38 +3463,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "x64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "x64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -3599,7 +3534,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"x64-asan-shared/libffmpeg.so",
"x64-asan-ubsan-shared/libffmpeg.so",
"x64-lto-shared/libffmpeg.so",
diff --git a/recipes/ffmpeg.expected/cq.json b/recipes/ffmpeg.expected/cq.json
index 40e1d7c..e52fbb1 100644
--- a/recipes/ffmpeg.expected/cq.json
+++ b/recipes/ffmpeg.expected/cq.json
@@ -1522,38 +1522,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "arm64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "arm64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1663,8 +1631,7 @@
"arm64-profile-shared/libffmpeg.so",
"arm64-shared/libffmpeg.so",
"arm64-thinlto-shared/libffmpeg.so",
- "arm64-ubsan-shared/libffmpeg.so",
- "path/on/disk/to/test"
+ "arm64-ubsan-shared/libffmpeg.so"
],
"name": "arm64.build.build fuchsia.ninja.fuchsia",
"~followup_annotations": [
@@ -3584,38 +3551,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "x64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "x64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -3687,7 +3622,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"x64-asan-shared/libffmpeg.so",
"x64-asan-ubsan-shared/libffmpeg.so",
"x64-lto-shared/libffmpeg.so",
diff --git a/recipes/ffmpeg.expected/default.json b/recipes/ffmpeg.expected/default.json
index 37186fd..e9fc111 100644
--- a/recipes/ffmpeg.expected/default.json
+++ b/recipes/ffmpeg.expected/default.json
@@ -1434,38 +1434,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "arm64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "arm64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1575,8 +1543,7 @@
"arm64-profile-shared/libffmpeg.so",
"arm64-shared/libffmpeg.so",
"arm64-thinlto-shared/libffmpeg.so",
- "arm64-ubsan-shared/libffmpeg.so",
- "path/on/disk/to/test"
+ "arm64-ubsan-shared/libffmpeg.so"
],
"name": "arm64.build.build fuchsia.ninja.fuchsia",
"~followup_annotations": [
@@ -3496,38 +3463,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "x64.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "x64.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -3599,7 +3534,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"x64-asan-shared/libffmpeg.so",
"x64-asan-ubsan-shared/libffmpeg.so",
"x64-lto-shared/libffmpeg.so",
diff --git a/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json b/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
index 48560c5..c650d90 100644
--- a/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
+++ b/recipes/fuchsia/build.expected/build_type_release_not_run_tests.json
@@ -1649,38 +1649,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1796,7 +1764,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia/build.expected/sdk.json b/recipes/fuchsia/build.expected/sdk.json
index d092f6b..76aaeb6 100644
--- a/recipes/fuchsia/build.expected/sdk.json
+++ b/recipes/fuchsia/build.expected/sdk.json
@@ -1571,38 +1571,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1718,7 +1686,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"sdk/archive/core.tar.gz",
"sdk/archive/fuchsia_dart.tar.gz",
"zircon-r.zbi"
diff --git a/recipes/fuchsia_perf.expected/device_tests.json b/recipes/fuchsia_perf.expected/device_tests.json
index 85d3ff2..9571f64 100644
--- a/recipes/fuchsia_perf.expected/device_tests.json
+++ b/recipes/fuchsia_perf.expected/device_tests.json
@@ -1458,38 +1458,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1602,7 +1570,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia_perf.expected/failed_run.json b/recipes/fuchsia_perf.expected/failed_run.json
index f0ec490..558c7c0 100644
--- a/recipes/fuchsia_perf.expected/failed_run.json
+++ b/recipes/fuchsia_perf.expected/failed_run.json
@@ -1458,38 +1458,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1602,7 +1570,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia_perf.expected/missing_test_results.json b/recipes/fuchsia_perf.expected/missing_test_results.json
index 2af43fd..6cf8956 100644
--- a/recipes/fuchsia_perf.expected/missing_test_results.json
+++ b/recipes/fuchsia_perf.expected/missing_test_results.json
@@ -1458,38 +1458,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1602,7 +1570,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia_perf.expected/successful_run.json b/recipes/fuchsia_perf.expected/successful_run.json
index afc8be8..6fe14a4 100644
--- a/recipes/fuchsia_perf.expected/successful_run.json
+++ b/recipes/fuchsia_perf.expected/successful_run.json
@@ -1458,38 +1458,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1602,7 +1570,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia_perf.expected/with_patch.json b/recipes/fuchsia_perf.expected/with_patch.json
index 42f8c31..b1648f4 100644
--- a/recipes/fuchsia_perf.expected/with_patch.json
+++ b/recipes/fuchsia_perf.expected/with_patch.json
@@ -1547,38 +1547,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1691,7 +1659,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/fuchsia_perfcompare.expected/successful_run.json b/recipes/fuchsia_perfcompare.expected/successful_run.json
index 2ab8344..3dcad7c 100644
--- a/recipes/fuchsia_perfcompare.expected/successful_run.json
+++ b/recipes/fuchsia_perfcompare.expected/successful_run.json
@@ -1482,38 +1482,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build and launch tests for \"before\" revision.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build and launch tests for \"before\" revision.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1627,7 +1595,6 @@
"multiboot.bin",
"netboot.zbi",
"obj/build/images/system.snapshot",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build and launch tests for \"before\" revision.build.build fuchsia.ninja.fuchsia",
@@ -3381,38 +3348,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build and launch tests for \"after\" revision.build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build and launch tests for \"after\" revision.build.build fuchsia.ninja",
"~followup_annotations": [
@@ -3494,7 +3429,6 @@
"multiboot.bin",
"netboot.zbi",
"obj/build/images/system.snapshot",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build and launch tests for \"after\" revision.build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/linux_sysroot.expected/basic.json b/recipes/linux_sysroot.expected/basic.json
index 160d942..cdc1cd7 100644
--- a/recipes/linux_sysroot.expected/basic.json
+++ b/recipes/linux_sysroot.expected/basic.json
@@ -1449,38 +1449,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/linux_sysroot/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1593,7 +1561,6 @@
"ids.txt",
"multiboot.bin",
"netboot.zbi",
- "path/on/disk/to/test",
"zircon-r.zbi"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/prebuilt_host_tool.expected/cipd_has_revision.json b/recipes/prebuilt_host_tool.expected/cipd_has_revision.json
index d014719..9b816bc 100644
--- a/recipes/prebuilt_host_tool.expected/cipd_has_revision.json
+++ b/recipes/prebuilt_host_tool.expected/cipd_has_revision.json
@@ -1433,38 +1433,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1568,7 +1536,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"tools/json_validator"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/prebuilt_host_tool.expected/default.json b/recipes/prebuilt_host_tool.expected/default.json
index bb0af2b..553b9d1 100644
--- a/recipes/prebuilt_host_tool.expected/default.json
+++ b/recipes/prebuilt_host_tool.expected/default.json
@@ -1433,38 +1433,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1568,7 +1536,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"tools/json_validator"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json b/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
index 8b04a32..13e87fc 100644
--- a/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
+++ b/recipes/prebuilt_host_tool.expected/gn_target_with_trailing_fwd_slash.json
@@ -1433,38 +1433,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1568,7 +1536,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"tools/json_validator/"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/prebuilt_host_tool.expected/no_revision.json b/recipes/prebuilt_host_tool.expected/no_revision.json
index ad3fc54..0e5a1e7 100644
--- a/recipes/prebuilt_host_tool.expected/no_revision.json
+++ b/recipes/prebuilt_host_tool.expected/no_revision.json
@@ -1433,38 +1433,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1568,7 +1536,6 @@
"[START_DIR]/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"tools/json_validator"
],
"name": "build.build fuchsia.ninja.fuchsia",
diff --git a/recipes/sdk_subbuild.expected/basic.json b/recipes/sdk_subbuild.expected/basic.json
index e1f18ef..4f0a3f5 100644
--- a/recipes/sdk_subbuild.expected/basic.json
+++ b/recipes/sdk_subbuild.expected/basic.json
@@ -1418,38 +1418,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1553,7 +1521,6 @@
"[START_DIR]/fuchsia/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"sdk/archive/core.tar.gz",
"sdk/archive/fuchsia_dart.tar.gz"
],
diff --git a/recipes/sdk_subbuild.expected/snapshot.json b/recipes/sdk_subbuild.expected/snapshot.json
index c21147b..695a380 100644
--- a/recipes/sdk_subbuild.expected/snapshot.json
+++ b/recipes/sdk_subbuild.expected/snapshot.json
@@ -1500,38 +1500,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1635,7 +1603,6 @@
"[START_DIR]/fuchsia/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"sdk/archive/core.tar.gz",
"sdk/archive/fuchsia_dart.tar.gz"
],
diff --git a/recipes/sdk_subbuild.expected/snapshot_cq.json b/recipes/sdk_subbuild.expected/snapshot_cq.json
index a33f942..4b703a8 100644
--- a/recipes/sdk_subbuild.expected/snapshot_cq.json
+++ b/recipes/sdk_subbuild.expected/snapshot_cq.json
@@ -1598,38 +1598,6 @@
]
},
{
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[START_DIR]/fuchsia/out/default/tests.json",
- "/path/to/tmp/json"
- ],
- "name": "build.build fuchsia.read test spec manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//public/lib/foo:foo_tests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"foo_tests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"linux\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/disk/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"label\": \"//lib/bar:bar_unittests(//some/toolchain)\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"bar_unittests\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"os\": \"fuchsia\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"path\": \"path/on/fuchsia/to/test\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [],
"name": "build.build fuchsia.ninja",
"~followup_annotations": [
@@ -1733,7 +1701,6 @@
"[START_DIR]/fuchsia/out/default",
"-j",
"80",
- "path/on/disk/to/test",
"sdk/archive/core.tar.gz",
"sdk/archive/fuchsia_dart.tar.gz"
],
