| Index: scripts/slave/recipes/boringssl.expected/win64_small.json
|
| diff --git a/scripts/slave/recipes/boringssl.expected/win64_small.json b/scripts/slave/recipes/boringssl.expected/win64_small.json
|
| index 5aa9e035ec10818cd9051d3bebdde68372e8bc68..1af89c28d718a80109127413476057a2100f1506 100644
|
| --- a/scripts/slave/recipes/boringssl.expected/win64_small.json
|
| +++ b/scripts/slave/recipes/boringssl.expected/win64_small.json
|
| @@ -11,13 +11,13 @@
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'util/bot/DEPS', 'managed': True, 'name': 'boringssl', 'url': 'https://boringssl.googlesource.com/boringssl.git'}]",
|
| "--root",
|
| "boringssl",
|
| "--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]"
|
| },
|
| @@ -54,7 +53,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -65,9 +63,8 @@
|
| "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]\\boringssl\\build"
|
| + "[CWD]\\boringssl\\build"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree clean",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -85,10 +82,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]\\boringssl\\build",
|
| + "[CWD]\\boringssl\\build",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs mkdir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -107,43 +103,42 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\go\\env.py",
|
| "python",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\vs_env.py",
|
| "x64",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\cmake-win32\\bin\\cmake.exe",
|
| + "[CWD]\\boringssl\\util\\bot\\cmake-win32\\bin\\cmake.exe",
|
| "-GNinja",
|
| - "-DCMAKE_ASM_NASM_COMPILER=[SLAVE_BUILD]/boringssl/util/bot/yasm-win32.exe",
|
| + "-DCMAKE_ASM_NASM_COMPILER=[CWD]/boringssl/util/bot/yasm-win32.exe",
|
| "-DCMAKE_CXX_FLAGS=-DOPENSSL_SMALL=1",
|
| "-DCMAKE_C_FLAGS=-DOPENSSL_SMALL=1",
|
| - "-DPERL_EXECUTABLE=[SLAVE_BUILD]\\boringssl\\util\\bot\\perl-win32\\perl\\bin\\perl.exe",
|
| - "[SLAVE_BUILD]\\boringssl"
|
| + "-DPERL_EXECUTABLE=[CWD]\\boringssl\\util\\bot\\perl-win32\\perl\\bin\\perl.exe",
|
| + "[CWD]\\boringssl"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\boringssl\\build",
|
| + "cwd": "[CWD]\\boringssl\\build",
|
| "name": "cmake"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\go\\env.py",
|
| "python",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\vs_env.py",
|
| "x64",
|
| "ninja",
|
| "-C",
|
| - "[SLAVE_BUILD]\\boringssl\\build"
|
| + "[CWD]\\boringssl\\build"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ninja"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\go\\env.py",
|
| "python",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\vs_env.py",
|
| "x64",
|
| "go",
|
| "run",
|
| @@ -151,7 +146,7 @@
|
| "-json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\boringssl",
|
| + "cwd": "[CWD]\\boringssl",
|
| "name": "unit tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
|
| @@ -200,9 +195,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\go\\env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\go\\env.py",
|
| "python",
|
| - "[SLAVE_BUILD]\\boringssl\\util\\bot\\vs_env.py",
|
| + "[CWD]\\boringssl\\util\\bot\\vs_env.py",
|
| "x64",
|
| "go",
|
| "test",
|
| @@ -210,7 +205,7 @@
|
| "-json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\boringssl\\ssl\\test\\runner",
|
| + "cwd": "[CWD]\\boringssl\\ssl\\test\\runner",
|
| "name": "ssl tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
|
|
|