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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/ios/example.expected/basic.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/ios/api.py ('k') | scripts/slave/recipe_modules/ios/example.expected/clobber.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/ios/example.expected/basic.json
diff --git a/scripts/slave/recipe_modules/ios/example.expected/basic.json b/scripts/slave/recipe_modules/ios/example.expected/basic.json
index 333b82a9fd423b9fb34fb7c4ba0fa989107d58e8..7338487d5cc9d82583b8f70732243e53a01af567 100644
--- a/scripts/slave/recipe_modules/ios/example.expected/basic.json
+++ b/scripts/slave/recipe_modules/ios/example.expected/basic.json
@@ -11,13 +11,13 @@
"--slave",
"fake-vm",
"--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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']",
+ "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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']",
"--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]"
},
@@ -101,9 +102,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/ios/build/bots/chromium.fake/ios.json",
+ "[SLAVE_BUILD]/src/ios/build/bots/chromium.fake/ios.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read build config",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -143,9 +145,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/ios/build/bots/tests/fake include.json",
+ "[SLAVE_BUILD]/src/ios/build/bots/tests/fake include.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "include fake include.json",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -167,6 +170,7 @@
"-e",
"{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"xcodebuild\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.1\", \n \"tests\": [\n {\n \"app\": \"fake test 1\", \n \"device type\": \"fake device 1\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake included test 1\", \n \"device type\": \"fake device 1\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake included test 2\", \n \"device type\": \"fake device 1\", \n \"os\": \"8.1\"\n }, \n {\n \"app\": \"fake test 2\", \n \"device type\": \"fake device 2\", \n \"os\": \"7.1\"\n }, \n {\n \"app\": \"fake included test 1\", \n \"device type\": \"fake device 2\", \n \"os\": \"7.1\"\n }, \n {\n \"app\": \"fake included test 2\", \n \"device type\": \"fake device 2\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"6.1.1\"\n}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "finalize build config"
},
{
@@ -177,6 +181,7 @@
"--version",
"6.1.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "find xcode",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -190,6 +195,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GYP_DEFINES": "component=static_library OS=ios",
"GYP_GENERATORS": "xcode",
@@ -208,27 +214,28 @@
"-configuration",
"Debug",
"-project",
- "[CWD]/src/build/all.xcodeproj",
+ "[SLAVE_BUILD]/src/build/all.xcodeproj",
"-sdk",
"iphonesimulator8.1"
],
- "cwd": "[CWD]/src/xcodebuild",
+ "cwd": "[SLAVE_BUILD]/src/xcodebuild",
"name": "compile"
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake test 1.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake test 1.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 1",
"--version",
"8.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake test 1 (fake device 1 iOS 8.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -253,16 +260,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 1",
"--version",
"8.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake included test 1 (fake device 1 iOS 8.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -287,16 +295,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 1",
"--version",
"8.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake included test 2 (fake device 1 iOS 8.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -321,16 +330,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake test 2.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake test 2.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 2",
"--version",
"7.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake test 2 (fake device 2 iOS 7.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -355,16 +365,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 1.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 2",
"--version",
"7.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake included test 1 (fake device 2 iOS 7.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -389,16 +400,17 @@
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/ios/run.py",
"--app",
- "[CWD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
+ "[SLAVE_BUILD]/src/xcodebuild/Debug-iphonesimulator/fake included test 2.app",
"--json_file",
"/path/to/tmp/json",
"--iossim",
- "[CWD]/src/xcodebuild/ninja-iossim/Debug/iossim",
+ "[SLAVE_BUILD]/src/xcodebuild/ninja-iossim/Debug/iossim",
"--platform",
"fake device 2",
"--version",
"7.1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "fake included test 2 (fake device 2 iOS 7.1)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
« no previous file with comments | « scripts/slave/recipe_modules/ios/api.py ('k') | scripts/slave/recipe_modules/ios/example.expected/clobber.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698