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

Unified Diff: scripts/slave/recipes/boringssl.expected/failed_ssl_tests.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/boringssl.expected/failed_ssl_tests.json
diff --git a/scripts/slave/recipes/boringssl.expected/failed_ssl_tests.json b/scripts/slave/recipes/boringssl.expected/failed_ssl_tests.json
index 53163b65d41ed288787ad22956df8fa87441dd82..b987b90a919e7b5f88a1a428133db8f6ac349e30 100644
--- a/scripts/slave/recipes/boringssl.expected/failed_ssl_tests.json
+++ b/scripts/slave/recipes/boringssl.expected/failed_ssl_tests.json
@@ -11,13 +11,13 @@
"--slave",
"slavename",
"--spec",
- "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'}]",
+ "cache_dir = '[GIT_CACHE]'\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",
- "[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]"
},
@@ -53,6 +54,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -63,8 +65,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]/boringssl/build"
+ "[SLAVE_BUILD]/boringssl/build"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree clean",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -82,9 +85,10 @@
"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",
- "[CWD]/boringssl/build",
+ "[SLAVE_BUILD]/boringssl/build",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs mkdir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -103,37 +107,38 @@
"cmd": [
"python",
"-u",
- "[CWD]/boringssl/util/bot/go/env.py",
- "[CWD]/boringssl/util/bot/cmake-linux64/bin/cmake",
+ "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
+ "[SLAVE_BUILD]/boringssl/util/bot/cmake-linux64/bin/cmake",
"-GNinja",
- "[CWD]/boringssl"
+ "[SLAVE_BUILD]/boringssl"
],
- "cwd": "[CWD]/boringssl/build",
+ "cwd": "[SLAVE_BUILD]/boringssl/build",
"name": "cmake"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/boringssl/util/bot/go/env.py",
+ "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
"ninja",
"-C",
- "[CWD]/boringssl/build"
+ "[SLAVE_BUILD]/boringssl/build"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ninja"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/boringssl/util/bot/go/env.py",
+ "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
"go",
"run",
"util/all_tests.go",
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CWD]/boringssl",
+ "cwd": "[SLAVE_BUILD]/boringssl",
"name": "unit tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@test_utils.test_results@{@@@",
@@ -182,14 +187,14 @@
"cmd": [
"python",
"-u",
- "[CWD]/boringssl/util/bot/go/env.py",
+ "[SLAVE_BUILD]/boringssl/util/bot/go/env.py",
"go",
"test",
"-pipe",
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CWD]/boringssl/ssl/test/runner",
+ "cwd": "[SLAVE_BUILD]/boringssl/ssl/test/runner",
"name": "ssl tests",
"~followup_annotations": [
"step returned non-zero exit code: 5",

Powered by Google App Engine
This is Rietveld 408576698