| Index: scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_nexus6_aosp_perf_bisect.json
|
| diff --git a/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_nexus6_aosp_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_nexus6_aosp_perf_bisect.json
|
| index 63d578acf4e42171cbc72c987e4f3f3b248c2b9b..0dec5653fb90994cbd544a1dcea18836d402377f 100644
|
| --- a/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_nexus6_aosp_perf_bisect.json
|
| +++ b/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_nexus6_aosp_perf_bisect.json
|
| @@ -604,6 +604,32 @@
|
| "cmd": [
|
| "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",
|
| + "[SLAVE_BUILD]/bisect_results/dummy",
|
| + "511"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "makedirs results directory",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| @@ -624,7 +650,7 @@
|
| "--browser=android-chromium",
|
| "--output-format=valueset",
|
| "page_cycler_v2.intl_ar_fa_he",
|
| - "--output-dir=[TMP_BASE]/perf-test-output_tmp_1"
|
| + "--output-dir=[SLAVE_BUILD]/bisect_results/dummy"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -642,7 +668,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP_BASE]/perf-test-output_tmp_1/results-valueset.json",
|
| + "[SLAVE_BUILD]/bisect_results/dummy/results-valueset.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "env": {
|
| @@ -661,6 +687,32 @@
|
| "cmd": [
|
| "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",
|
| + "[SLAVE_BUILD]/bisect_results/dummy",
|
| + "511"
|
| + ],
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_webview_nexus6_aosp_perf_bisect/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "makedirs results directory (2)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| @@ -681,7 +733,7 @@
|
| "--browser=android-chromium",
|
| "--output-format=valueset",
|
| "page_cycler_v2.intl_ar_fa_he",
|
| - "--output-dir=[TMP_BASE]/perf-test-output_tmp_2"
|
| + "--output-dir=[SLAVE_BUILD]/bisect_results/dummy"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| @@ -699,7 +751,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP_BASE]/perf-test-output_tmp_2/results-valueset.json",
|
| + "[SLAVE_BUILD]/bisect_results/dummy/results-valueset.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "env": {
|
|
|