Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
index ccf704352238b5e9144d4be0ff15b65af1414d24..05c20fed1cc68f85f14a9f119dba578712bffe7a 100644
--- a/scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
+++ b/scripts/slave/recipes/skia/skia.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
@@ -7,7 +7,7 @@
"origin",
"https://skia.googlesource.com/skia.git"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "git remote set-url"
},
{
@@ -15,7 +15,7 @@
"git.bat",
"fetch"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "git fetch"
},
{
@@ -25,7 +25,7 @@
"--hard",
"abc123"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "git reset"
},
{
@@ -35,7 +35,7 @@
"-d",
"-f"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "git clean"
},
{
@@ -45,8 +45,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"config",
"--spec",
- "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -56,10 +57,11 @@
"cmd": [
"python",
"-u",
- "[ROOT]\\b\\build\\scripts\\slave\\gclient_safe_revert.py",
+ "[BUILD]\\scripts\\slave\\gclient_safe_revert.py",
".",
- "[ROOT]\\b\\depot_tools\\gclient.bat"
+ "[DEPOT_TOOLS]\\gclient.bat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gclient revert"
},
{
@@ -77,6 +79,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -97,9 +100,9 @@
"cmd": [
"python",
"-u",
- "[ROOT]\\b\\depot_tools\\apply_issue.py",
+ "[DEPOT_TOOLS]\\apply_issue.py",
"-r",
- "[CWD]\\skia",
+ "[SLAVE_BUILD]\\skia",
"-i",
"500",
"-p",
@@ -108,6 +111,7 @@
"https://codereview.chromium.org",
"--no-auth"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "apply_issue",
"~followup_annotations": [
"@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
@@ -117,11 +121,11 @@
"cmd": [
"python",
"-u",
- "[CWD]\\skia\\tools\\buildbot_spec.py",
+ "[SLAVE_BUILD]\\skia\\tools\\buildbot_spec.py",
"/path/to/tmp/json",
"Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -163,12 +167,12 @@
"make.py",
"nanobench"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"env": {
"BUILDTYPE": "Release_x64",
"CHROME_PATH": "[HOME]\\src",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
- "SKIA_OUT": "[CWD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
+ "SKIA_OUT": "[SLAVE_BUILD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
},
"name": "build nanobench"
},
@@ -177,9 +181,10 @@
"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",
- "[CWD]\\tmp",
+ "[SLAVE_BUILD]\\tmp",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs tmp_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -199,9 +204,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\tmp\\SKP_VERSION",
+ "[SLAVE_BUILD]\\tmp\\SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SKP_VERSION"
},
{
@@ -209,9 +215,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\skia\\SKP_VERSION",
+ "[SLAVE_BUILD]\\skia\\SKP_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SKP_VERSION"
},
{
@@ -219,9 +226,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\tmp\\SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]\\tmp\\SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get downloaded SK_IMAGE_VERSION"
},
{
@@ -229,9 +237,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\skia\\SK_IMAGE_VERSION",
+ "[SLAVE_BUILD]\\skia\\SK_IMAGE_VERSION",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get expected SK_IMAGE_VERSION"
},
{
@@ -239,8 +248,9 @@
"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",
- "[CWD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data"
+ "[SLAVE_BUILD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -258,9 +268,10 @@
"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",
- "[CWD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
+ "[SLAVE_BUILD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs data",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -290,24 +301,24 @@
"--format=%at",
"-s"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"name": "git show",
"stdout": "/path/to/tmp/"
},
{
"cmd": [
- "[CWD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\Release_x64\\nanobench",
+ "[SLAVE_BUILD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\Release_x64\\nanobench",
"--undefok",
"-i",
- "[CWD]\\skia\\resources",
+ "[SLAVE_BUILD]\\skia\\resources",
"--skps",
- "[CWD]\\playback\\skps",
+ "[SLAVE_BUILD]\\playback\\skps",
"--images",
- "[CWD]\\images\\dm",
+ "[SLAVE_BUILD]\\images\\dm",
"--nocpu",
"--dummy-flags",
"--outResultsFile",
- "[CWD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data\\nanobench_164710_1408633190.json",
+ "[SLAVE_BUILD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data\\nanobench_164710_1408633190.json",
"--properties",
"gitHash",
"164710",
@@ -331,10 +342,11 @@
"os",
"Win8"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Release_x64",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
- "SKIA_OUT": "[CWD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
+ "SKIA_OUT": "[SLAVE_BUILD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
},
"name": "nanobench"
},
@@ -343,9 +355,10 @@
"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",
- "[CWD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
+ "[SLAVE_BUILD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs perf_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -367,18 +380,18 @@
"RECIPE_MODULE[build::skia]\\resources\\upload_bench_results.py",
"Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot",
"5",
- "[CWD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
+ "[SLAVE_BUILD]\\perfdata\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot\\data",
"164710",
- "[ROOT]\\b\\depot_tools\\third_party\\gsutil\\gsutil",
+ "[DEPOT_TOOLS]\\third_party\\gsutil\\gsutil",
"500"
],
- "cwd": "[CWD]\\skia",
+ "cwd": "[SLAVE_BUILD]\\skia",
"env": {
"AWS_CREDENTIAL_FILE": "[HOME]\\chromium-skia-gm.boto",
"BOTO_CONFIG": "[HOME]\\chromium-skia-gm.boto",
"BUILDTYPE": "Release_x64",
"GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_dump_stats=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp",
- "SKIA_OUT": "[CWD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
+ "SKIA_OUT": "[SLAVE_BUILD]\\skia\\out\\Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot"
},
"name": "Upload nanobench Results"
},

Powered by Google App Engine
This is Rietveld 408576698