| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__kk_nexus5__forced_invalid.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__kk_nexus5__forced_invalid.json
|
| similarity index 52%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__kk_nexus5__forced_invalid.json
|
| index ef4a8d48fd7ecb15b138bd7d6b9d426ab82d5d9d..ff8f2a0873e556b01429e6171e7bc26c25ea854b 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android_tests__kk_nexus5__forced_invalid.json
|
| @@ -20,8 +20,6 @@
|
| "--delete_unversioned_trees",
|
| "--force",
|
| "--verbose",
|
| - "--revision",
|
| - "src@12345",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -58,19 +56,39 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| + "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| + "[SLAVE_BUILD]/src/out/Release"
|
| + ],
|
| + "name": "rmtree build directory",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/extract_build.py",
|
| "--target",
|
| "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--"
|
| + "--build-url",
|
| + "gs://chromium-webrtc/android_rel",
|
| + "--factory-properties",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android Tests (KK Nexus5)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": null, \"recipe\": \"webrtc/standalone\", \"slavename\": \"slavename\"}",
|
| + "--build-properties",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android Tests (KK Nexus5)\", \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": null, \"recipe\": \"webrtc/standalone\", \"slavename\": \"slavename\"}"
|
| ],
|
| - "name": "compile"
|
| + "name": "extract build"
|
| + },
|
| + {
|
| + "name": "$final_result",
|
| + "reason": "Testers cannot be forced without providing revision information.Please select a previous build and click [Rebuild] or force a buildfor a Builder instead (will trigger new runs for the testers).",
|
| + "status_code": 1
|
| }
|
| ]
|
|
|