| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_cronet.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x64_dbg.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_cronet.json
|
| similarity index 91%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x64_dbg.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_cronet.json
|
| index 950296d269b67c6a9b43f0e45edd8abafeb22c22..1bfa962b7c8c20a2ab89cf07e0757e33c45c731b 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_compile_x64_dbg.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_cronet.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/android_compile_x64_dbg",
|
| + "[BUILDER_CACHE]/android_cronet",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -29,7 +29,7 @@
|
| "--master",
|
| "tryserver.chromium.android",
|
| "--builder",
|
| - "android_compile_x64_dbg",
|
| + "android_cronet",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -52,7 +52,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_compile_x64_dbg",
|
| + "cwd": "[BUILDER_CACHE]/android_cronet",
|
| "env": {
|
| "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| @@ -198,13 +198,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_compile_x64_dbg/src",
|
| + "cwd": "[BUILDER_CACHE]/android_cronet/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/android_compile_x64_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_compile_x64_dbg/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm use_goma=1",
|
| + "PATH": "[BUILDER_CACHE]/android_cronet/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_cronet/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks (with patch)"
|
| },
|
| @@ -212,16 +212,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/android_compile_x64_dbg/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/android_cronet/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Debug",
|
| + "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/android_compile_x64_dbg/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/android_cronet/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"android_compile_x64_dbg\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"android_cronet\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -234,12 +234,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/android_compile_x64_dbg/src/testing/buildbot/chromium.android.json",
|
| + "[BUILDER_CACHE]/android_cronet/src/testing/buildbot/chromium.android.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.android.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/android_compile_x64_dbg/src/testing/buildbot/chromium.android.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/android_cronet/src/testing/buildbot/chromium.android.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -251,7 +251,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/android_compile_x64_dbg/src",
|
| + "cwd": "[BUILDER_CACHE]/android_cronet/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -265,7 +265,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/android_compile_x64_dbg/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]/android_cronet/src/testing/buildbot/trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
|
|