Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_failure.json |
diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_failure.json |
index 980e248ef56a5bfd184a1933014018b5d3ffee00..ac272c674220e5fa00b137eb445bc67353d06c3f 100644 |
--- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_failure.json |
+++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_trigger_failure.json |
@@ -1229,10 +1229,14 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "breakpad_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--isolate_file_path=[SLAVE_BUILD]/src/breakpad/breakpad_unittests.isolate", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
@@ -1240,6 +1244,7 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "breakpad_unittests" |
@@ -1248,16 +1253,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_cc_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "cc_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "cc_unittests" |
@@ -1266,16 +1276,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_content_browsertests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "content_browsertests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "content_browsertests" |
@@ -1284,16 +1299,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_content_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "content_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "content_unittests" |
@@ -1302,16 +1322,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_gpu_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "gpu_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "gpu_unittests" |
@@ -1320,16 +1345,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_media_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "media_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "media_unittests" |
@@ -1338,10 +1368,14 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_net_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "net_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
@@ -1351,6 +1385,7 @@ |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "net_unittests" |
@@ -1359,16 +1394,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "sandbox_linux_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "sandbox_linux_unittests" |
@@ -1377,16 +1417,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_ui_base_unittests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "ui_base_unittests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "ui_base_unittests" |
@@ -1395,16 +1440,21 @@ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/out/Release/bin/run_unit_tests", |
+ "[SLAVE_BUILD]/src/build/android/test_runner.py", |
+ "gtest", |
+ "-s", |
+ "unit_tests", |
"--blacklist-file", |
"[SLAVE_BUILD]/src/out/bad_devices.json", |
"--verbose", |
+ "--release", |
"--flakiness-dashboard-server=test-results.appspot.com", |
"--json-results-file", |
"/path/to/tmp/json" |
], |
"cwd": "[SLAVE_BUILD]", |
"env": { |
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "unit_tests" |