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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.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/chromium_libfuzzer.py ('k') | scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_MSan.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.json
diff --git a/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.json b/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.json
index 871f678f3e8fff08aa85b44fe6061c18df0be7e9..bc3166350d4cddb7e44120f429fdc421179468a5 100644
--- a/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.json
+++ b/scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_ASan.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--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]"
},
@@ -103,10 +104,11 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "clang=1 component=static_library gomadir='[ROOT]/b/build/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -115,31 +117,33 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/mb/mb.py",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.fyi",
"-b",
"Libfuzzer Upload Linux ASan",
"--config-file",
- "[CWD]/src/tools/mb/mb_config.pyl",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"//out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files"
},
{
"cmd": [
"python",
"-u",
- "[ROOT]/b/depot_tools/gn.py",
- "--root=[CWD]/src",
+ "[DEPOT_TOOLS]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
"refs",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--all",
"--type=executable",
"--as=output",
"//testing/libfuzzer:libfuzzer_main"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "calculate all_fuzzers",
"stdout": "/path/to/tmp/"
},
@@ -147,15 +151,16 @@
"cmd": [
"python",
"-u",
- "[ROOT]/b/depot_tools/gn.py",
- "--root=[CWD]/src",
+ "[DEPOT_TOOLS]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
"refs",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--all",
"--type=executable",
"--as=output",
"//testing/libfuzzer:no_clusterfuzz"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "calculate no_clusterfuzz",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -177,10 +182,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -207,9 +213,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -219,11 +225,12 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--",
"target2",
"target3"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -238,9 +245,10 @@
"python",
"-u",
"\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "listdir build_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -261,18 +269,19 @@
"python",
"-u",
"RECIPE_MODULE[build::archive]/resources/zip_archive.py",
- "[TMP]/chrome_staging_tmp_1",
+ "[TMP_BASE]/chrome_staging_tmp_1",
"libfuzzer-linux-release-170242",
"[\"file 1\", \"file 2\"]",
- "[CWD]/src/out/Release"
+ "[SLAVE_BUILD]/src/out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "zipping"
},
{
"cmd": [
"python",
"-u",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"--",
"-h",
"x-goog-meta-Cr-Commit-Position:refs/heads/master@{#170242}",
@@ -283,9 +292,10 @@
"cp",
"-a",
"public-read",
- "[TMP]/chrome_staging_tmp_1/libfuzzer-linux-release-170242.zip",
+ "[TMP_BASE]/chrome_staging_tmp_1/libfuzzer-linux-release-170242.zip",
"gs://chromium-browser-libfuzzer/linux-release-asan/libfuzzer-linux-release-170242.zip"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-libfuzzer/linux-release-asan/libfuzzer-linux-release-170242.zip@@@"
@@ -296,8 +306,9 @@
"python",
"-u",
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
- "[TMP]/chrome_staging_tmp_1/libfuzzer-linux-release-170242.zip"
+ "[TMP_BASE]/chrome_staging_tmp_1/libfuzzer-linux-release-170242.zip"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "libfuzzer-linux-release-170242.zip",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
« no previous file with comments | « scripts/slave/recipes/chromium_libfuzzer.py ('k') | scripts/slave/recipes/chromium_libfuzzer.expected/full_chromium_fyi_Libfuzzer_Upload_Linux_MSan.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698