Index: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic__dbg_.json |
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic__dbg_.json |
similarity index 95% |
copy from scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic.json |
copy to scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic__dbg_.json |
index 6a56a4faa25566c803b31acf88f97184b24bcd0a..74e00a3d5dfdef14fdf434e228b97cba61c9b284 100644 |
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic.json |
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic__dbg_.json |
@@ -125,8 +125,8 @@ |
"python", |
"-u", |
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n", |
- "[SLAVE_BUILD]/src/out/Release/debug_info_dumps", |
- "[SLAVE_BUILD]/src/out/Release/test_logs", |
+ "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps", |
+ "[SLAVE_BUILD]/src/out/Debug/test_logs", |
"[SLAVE_BUILD]/src/out/build_product.zip", |
"[SLAVE_BUILD]/src" |
], |
@@ -152,18 +152,18 @@ |
"python", |
"-u", |
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py", |
- "[SLAVE_BUILD]/src/out/Release.1" |
+ "[SLAVE_BUILD]/src/out/Debug.1" |
], |
- "name": "rmtree [SLAVE_BUILD]/src/out/Release.1" |
+ "name": "rmtree [SLAVE_BUILD]/src/out/Debug.1" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
"RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py", |
- "[SLAVE_BUILD]/src/out/Release.2" |
+ "[SLAVE_BUILD]/src/out/Debug.2" |
], |
- "name": "rmtree [SLAVE_BUILD]/src/out/Release.2" |
+ "name": "rmtree [SLAVE_BUILD]/src/out/Debug.2" |
}, |
{ |
"cmd": [], |
@@ -228,7 +228,7 @@ |
"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", |
- "[SLAVE_BUILD]/src/out/Release" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
"name": "rmtree clobber", |
"~followup_annotations": [ |
@@ -267,12 +267,12 @@ |
"-m", |
"chromium.swarm", |
"-b", |
- "Android deterministic", |
+ "Android deterministic (dbg)", |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
"[CACHE]/cipd/goma", |
- "//out/Release" |
+ "//out/Debug" |
], |
"cwd": "[SLAVE_BUILD]/src", |
"env": { |
@@ -293,13 +293,13 @@ |
"--ninja-path", |
"RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
"--target", |
- "Release", |
+ "Debug", |
"--src-dir", |
"[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
"[GOMA_CACHE]", |
"--buildbot-buildername", |
- "Android deterministic", |
+ "Android deterministic (dbg)", |
"--buildbot-mastername", |
"chromium.swarm", |
"--buildbot-slavename", |
@@ -331,7 +331,7 @@ |
"-u", |
"[SLAVE_BUILD]/src/tools/determinism/remove_build_metadata.py", |
"--build-dir", |
- "[SLAVE_BUILD]/src/out/Release" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "remove_build_metadata", |
@@ -345,10 +345,10 @@ |
"python", |
"-u", |
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])", |
- "[SLAVE_BUILD]/src/out/Release", |
- "[SLAVE_BUILD]/src/out/Release.1" |
+ "[SLAVE_BUILD]/src/out/Debug", |
+ "[SLAVE_BUILD]/src/out/Debug.1" |
], |
- "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.1", |
+ "name": "Move [SLAVE_BUILD]/src/out/Debug to [SLAVE_BUILD]/src/out/Debug.1", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@import os@@@", |
@@ -365,7 +365,7 @@ |
"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", |
- "[SLAVE_BUILD]/src/out/Release" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
"name": "rmtree clobber (2)", |
"~followup_annotations": [ |
@@ -404,12 +404,12 @@ |
"-m", |
"chromium.swarm", |
"-b", |
- "Android deterministic", |
+ "Android deterministic (dbg)", |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
"[CACHE]/cipd/goma", |
- "//out/Release" |
+ "//out/Debug" |
], |
"cwd": "[SLAVE_BUILD]/src", |
"env": { |
@@ -430,13 +430,13 @@ |
"--ninja-path", |
"RECIPE_PACKAGE_REPO[depot_tools]/ninja", |
"--target", |
- "Release", |
+ "Debug", |
"--src-dir", |
"[SLAVE_BUILD]/src", |
"--goma-cache-dir", |
"[GOMA_CACHE]", |
"--buildbot-buildername", |
- "Android deterministic", |
+ "Android deterministic (dbg)", |
"--buildbot-mastername", |
"chromium.swarm", |
"--buildbot-slavename", |
@@ -468,7 +468,7 @@ |
"-u", |
"[SLAVE_BUILD]/src/tools/determinism/remove_build_metadata.py", |
"--build-dir", |
- "[SLAVE_BUILD]/src/out/Release" |
+ "[SLAVE_BUILD]/src/out/Debug" |
], |
"cwd": "[SLAVE_BUILD]", |
"name": "remove_build_metadata (2)" |
@@ -478,10 +478,10 @@ |
"python", |
"-u", |
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])", |
- "[SLAVE_BUILD]/src/out/Release", |
- "[SLAVE_BUILD]/src/out/Release.2" |
+ "[SLAVE_BUILD]/src/out/Debug", |
+ "[SLAVE_BUILD]/src/out/Debug.2" |
], |
- "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.2", |
+ "name": "Move [SLAVE_BUILD]/src/out/Debug to [SLAVE_BUILD]/src/out/Debug.2", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@import os@@@", |
@@ -499,9 +499,9 @@ |
"-u", |
"[SLAVE_BUILD]/src/tools/determinism/compare_build_artifacts.py", |
"--first-build-dir", |
- "[SLAVE_BUILD]/src/out/Release.1", |
+ "[SLAVE_BUILD]/src/out/Debug.1", |
"--second-build-dir", |
- "[SLAVE_BUILD]/src/out/Release.2", |
+ "[SLAVE_BUILD]/src/out/Debug.2", |
"--target-platform", |
"android" |
], |