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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.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
« no previous file with comments | « scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_vista_x64_drm.json ('k') | scripts/slave/recipes/client.dynamorio.recipe_autogen.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json
diff --git a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json
index 112be2cbebc82bedde8392588d9c33851312528a..7c8750fe1225c8ad3e9e78124b2b2ae4d3dc173a 100644
--- a/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json
+++ b/scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_xp_drm.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlave",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_deps': {'drmemory/dynamorio': 'https://github.com/DynamoRIO/dynamorio.git', 'tools/buildbot': 'https://github.com/DynamoRIO/buildbot.git'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'drmemory', 'url': 'https://github.com/DynamoRIO/drmemory.git'}]",
"--root",
"drmemory",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,6 +25,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -48,21 +49,22 @@
},
{
"cmd": [
- "[CWD]/tools/buildbot/bot_tools/unpack.bat"
+ "[SLAVE_BUILD]/tools/buildbot/bot_tools/unpack.bat"
],
- "cwd": "[CWD]/tools/buildbot/bot_tools",
+ "cwd": "[SLAVE_BUILD]/tools/buildbot/bot_tools",
"name": "unpack tools"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"ctest",
"--timeout",
"60",
"-VV",
"-S",
- "[CWD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=42"
+ "[SLAVE_BUILD]/drmemory/tests/runsuite.cmake,drmemory_only;long;build=42"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Dr. Memory ctest"
},
{
@@ -71,8 +73,9 @@
"checkout",
"--force",
"http://data-race-test.googlecode.com/svn/trunk/",
- "[CWD]/tsan"
+ "[SLAVE_BUILD]/tsan"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Checkout TSan tests"
},
{
@@ -80,119 +83,125 @@
"E:\\b\\build\\scripts\\slave\\drmemory\\build_env.bat",
"make",
"-C",
- "[CWD]/tsan/unittest"
+ "[SLAVE_BUILD]/tsan/unittest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools",
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools",
"CYGWIN": "nodosfilewarning"
},
"name": "Build TSan Tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"build_drmemory-dbg-32\\bin\\drmemory",
"-dr_ops",
"-msgbox_mask 0 -stderr_mask 15",
"-results_to_stderr",
"-batch",
"-suppress",
- "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+ "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
"--",
- "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+ "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
"--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
"-147"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "dbg full TSan tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"build_drmemory-dbg-32\\bin\\drmemory",
"-dr_ops",
"-msgbox_mask 0 -stderr_mask 15",
"-results_to_stderr",
"-batch",
"-suppress",
- "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+ "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
"-light",
"--",
- "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+ "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
"--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
"-147"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "dbg light TSan tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"build_drmemory-rel-32\\bin\\drmemory",
"-dr_ops",
"-msgbox_mask 0 -stderr_mask 15",
"-results_to_stderr",
"-batch",
"-suppress",
- "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+ "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
"--",
- "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+ "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
"--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
"-147"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "rel full TSan tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"build_drmemory-rel-32\\bin\\drmemory",
"-dr_ops",
"-msgbox_mask 0 -stderr_mask 15",
"-results_to_stderr",
"-batch",
"-suppress",
- "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+ "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
"-light",
"--",
- "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+ "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
"--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
"-147"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "rel light TSan tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"build_drmemory-dbg-32\\bin\\drmemory",
"-dr_ops",
"-msgbox_mask 0 -stderr_mask 15",
"-results_to_stderr",
"-batch",
"-suppress",
- "[CWD]/drmemory/tests/app_suite/default-suppressions.txt",
+ "[SLAVE_BUILD]/drmemory/tests/app_suite/default-suppressions.txt",
"--",
- "[CWD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
+ "[SLAVE_BUILD]/tsan/unittest/bin/racecheck_unittest-windows-x86-O0.exe",
"--gtest_filter=-PositiveTests.FreeVsRead:NegativeTests.WaitForMultiple*",
"-147"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "dbg full nosyms TSan tests"
},
{
"cmd": [
- "[ROOT]/b/build/scripts/slave/drmemory/build_env.bat",
+ "[BUILD]/scripts/slave/drmemory/build_env.bat",
"7z",
"a",
"-xr!*.pdb",
@@ -207,8 +216,9 @@
"build_drmemory-rel-64/Testing/Temporary",
"xmlresults"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "BOTTOOLS": "[CWD]/tools/buildbot/bot_tools"
+ "BOTTOOLS": "[SLAVE_BUILD]/tools/buildbot/bot_tools"
},
"name": "Pack test results"
},
@@ -218,12 +228,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
"testlogs_r123456789abcdef_b42.7z",
"gs://chromium-drmemory-builds/testlogs/from_win-xp-drm"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-drmemory-builds/testlogs/from_win-xp-drm@@@"
« no previous file with comments | « scripts/slave/recipes/client.drmemory.recipe_autogen.expected/win_vista_x64_drm.json ('k') | scripts/slave/recipes/client.dynamorio.recipe_autogen.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698