Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_cr.json |
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_cr.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_cr.json |
index a6c3550aefdb58c2f17e88ed21cdea96280680da..c13806d41184499a37cc823d79e50259880ceaf3 100644 |
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_cr.json |
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/linux_cr.json |
@@ -11,13 +11,13 @@ |
"--slave", |
"TestSlave", |
"--spec", |
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]", |
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'dynamorio', 'url': 'https://github.com/DynamoRIO/dynamorio.git'}]", |
"--root", |
"dynamorio", |
"--revision_mapping_file", |
"{}", |
"--git-cache-dir", |
- "[GIT_CACHE]", |
+ "[ROOT]/b/build/slave/cache_dir", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -25,7 +25,6 @@ |
"--force", |
"--output_manifest" |
], |
- "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -52,10 +51,9 @@ |
"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]/dynamorio", |
+ "[CWD]/dynamorio", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs makedirs", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -75,10 +73,9 @@ |
"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]/dynamorio/build", |
+ "[CWD]/dynamorio/build", |
"511" |
], |
- "cwd": "[SLAVE_BUILD]", |
"name": "makedirs makedirs (2)", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
@@ -99,7 +96,7 @@ |
"..", |
"-DDEBUG=OFF" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio/build", |
+ "cwd": "[CWD]/dynamorio/build", |
"name": "Configure release DynamoRIO" |
}, |
{ |
@@ -107,7 +104,7 @@ |
"make", |
"-j5" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio/build", |
+ "cwd": "[CWD]/dynamorio/build", |
"name": "Compile release DynamoRIO" |
}, |
{ |
@@ -118,14 +115,14 @@ |
"-norun", |
"-v" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio/build", |
+ "cwd": "[CWD]/dynamorio/build", |
"name": "don't follow python" |
}, |
{ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
@@ -133,7 +130,7 @@ |
"--run-layout-test", |
"file:///home/chrome-bot/bb.html" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -143,14 +140,14 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/base_unittests", |
"--gtest_filter=-TraceEventTestFixture.TraceContinuousSampling" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -160,14 +157,14 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/browser_tests", |
"--gtest_filter=AutofillTest.BasicFormFill" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -177,13 +174,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/crypto_unittests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -193,13 +190,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/ipc_tests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -209,13 +206,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/media_unittests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -225,14 +222,14 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/net_unittests", |
"--gtest_filter=-CertDatabaseNSSTest.ImportCACertHierarchy*" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -242,13 +239,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/printing_unittests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -258,14 +255,14 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/remoting_unittests", |
"--gtest_filter=-VideoFrameCapturerTest.Capture:DesktopProcessTest.DeathTest" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -275,13 +272,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/sql_unittests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -291,13 +288,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/unit_tests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |
@@ -307,13 +304,13 @@ |
"cmd": [ |
"xvfb-run", |
"-a", |
- "[SLAVE_BUILD]/dynamorio/build/bin64/drrun", |
+ "[CWD]/dynamorio/build/bin64/drrun", |
"-stderr_mask", |
"12", |
"--", |
"../../linux-cr-builder/build/src/out/Release/url_unittests" |
], |
- "cwd": "[SLAVE_BUILD]/dynamorio", |
+ "cwd": "[CWD]/dynamorio", |
"env": { |
"CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox" |
}, |