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

Unified Diff: scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.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/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.json
diff --git a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.json b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.json
index 076c5a64a75a23b801a563453823b55c0b922287..f65c1159b70370c2c5fd185851aa0acdd1493ba7 100644
--- a/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.json
+++ b/scripts/slave/recipes/crashpad/continuous.expected/crashpad_win_x86_rel_clobber.json
@@ -6,8 +6,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'crashpad', 'url': 'https://chromium.googlesource.com/crashpad/crashpad.git'}]"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -26,6 +27,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -46,8 +48,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]/crashpad/out"
+ "[SLAVE_BUILD]/crashpad/out"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree out",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -67,6 +70,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_DEFINES": "target_arch=ia32",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -77,17 +81,19 @@
"cmd": [
"ninja",
"-C",
- "[CWD]/crashpad/out/Release"
+ "[SLAVE_BUILD]/crashpad/out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "compile with ninja"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/crashpad/build/run_tests.py",
+ "[SLAVE_BUILD]/crashpad/build/run_tests.py",
"Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "run tests"
},
{

Powered by Google App Engine
This is Rietveld 408576698