| Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Nougat_Phone_Tester.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Lollipop_Phone_Tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Nougat_Phone_Tester.json
|
| similarity index 86%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Lollipop_Phone_Tester.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_android_Nougat_Phone_Tester.json
|
| index dbaea6b91745d6815bb0e44316d3aae44acbfeab..bd6abe8a6d1e2868b199e68a490aca30dcc7bcc6 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Lollipop_Phone_Tester.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Nougat_Phone_Tester.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]/Lollipop_Phone_Tester",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@1111111",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -182,7 +182,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -198,13 +198,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester/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 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm test_isolation_mode=prepare use_goma=1",
|
| - "PATH": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm64 test_isolation_mode=prepare use_goma=1",
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -212,16 +212,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Lollipop_Phone_Tester/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/Nougat_Phone_Tester/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Lollipop Phone Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Nougat Phone Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -234,14 +234,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/testing/buildbot/chromium.android.json",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/buildbot/chromium.android.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.android.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Lollipop_Phone_Tester/src/testing/buildbot/chromium.android.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/Nougat_Phone_Tester/src/testing/buildbot/chromium.android.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Lollipop Phone Tester\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Nougat Phone Tester\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| @@ -271,10 +271,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/Debug/debug_info_dumps",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/Debug/test_logs",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/build_product.zip",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src"
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/debug_info_dumps",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/test_logs",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -295,8 +295,8 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/tree_truth.sh",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/tree_truth.sh",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src",
|
| "src"
|
| ],
|
| "name": "tree truth steps"
|
| @@ -306,7 +306,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/Debug"
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -333,7 +333,7 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src",
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--master-name",
|
| @@ -349,14 +349,14 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/Debug",
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| },
|
| "name": "find isolated tests",
|
| "~followup_annotations": [
|
| @@ -375,10 +375,10 @@
|
| "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests_apk"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| },
|
| "name": "[error] browser_tests",
|
| "~followup_annotations": [
|
| @@ -396,10 +396,10 @@
|
| "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| },
|
| "name": "[collect error] browser_tests",
|
| "~followup_annotations": [
|
| @@ -415,12 +415,12 @@
|
| "python",
|
| "-u",
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| - "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/out/Debug/test_logs/*.log"
|
| + "[BUILDER_CACHE]/Nougat_Phone_Tester/src/out/Debug/test_logs/*.log"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Lollipop_Phone_Tester",
|
| + "cwd": "[BUILDER_CACHE]/Nougat_Phone_Tester",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[BUILDER_CACHE]/Lollipop_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Lollipop_Phone_Tester/src/build/android:%(PATH)s"
|
| + "PATH": "[BUILDER_CACHE]/Nougat_Phone_Tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Nougat_Phone_Tester/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_report",
|
| "~followup_annotations": [
|
|
|