scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.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/recipe_modules/amp/example.expected/bad_device_data_for_collect.json ('k') | scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json

diff --git a/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json b/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json

index 8f8a84bc3a4dd8efc27f776f6b20f466dcc4a423..430f7bb15abafaefb243ec81d836b439ac9a09b0 100644

--- a/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json

+++ b/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json

@@ -5,12 +5,13 @@

"-u",

"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

"--",

- "[ROOT]/b/depot_tools/gsutil.py",

+ "[DEPOT_TOOLS]/gsutil.py",

"----",

"cp",

"gs://chrome-amp-keys/main_pool/api_key",

- "[ROOT]/b/build/site_config/.amp_main_pool_key"

+ "[BUILD]/site_config/.amp_main_pool_key"

+ "cwd": "[SLAVE_BUILD]",

"name": "gsutil download amp api key"

{

@@ -19,19 +20,20 @@

"-u",

"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

"--",

- "[ROOT]/b/depot_tools/gsutil.py",

+ "[DEPOT_TOOLS]/gsutil.py",

"----",

"cp",

"gs://chrome-amp-keys/main_pool/api_secret",

- "[ROOT]/b/build/site_config/.amp_main_pool_secret"

+ "[BUILD]/site_config/.amp_main_pool_secret"

+ "cwd": "[SLAVE_BUILD]",

"name": "gsutil download amp api secret"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/build/android/test_runner.py",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

"gtest",

"-s",

"example_gtest_suite",

@@ -39,9 +41,9 @@

"-e",

"remote_device",

"--api-key-file",

- "[ROOT]/b/build/site_config/.amp_main_pool_key",

+ "[BUILD]/site_config/.amp_main_pool_key",

"--api-secret-file",

- "[ROOT]/b/build/site_config/.amp_main_pool_secret",

+ "[BUILD]/site_config/.amp_main_pool_secret",

"--api-address",

"127.0.0.1",

"--api-port",

@@ -58,8 +60,9 @@

"/path/to/tmp/json",

"--verbose"

+ "cwd": "[SLAVE_BUILD]",

"env": {

- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"

"name": "[trigger] example_gtest_suite",

"~followup_annotations": [