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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Linux.json

Issue 1737843003: Use regular chromium recipes for Chromium Mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Remove 'ninja_confirm_noop' config option. Created 4 years, 10 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/chromium.expected/full_chromium_mojo_Chromium_Mojo_Linux.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_Trusty.json b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Linux.json
similarity index 91%
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_Trusty.json
copy to scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Linux.json
index 42886e8e5dabcb3c5e8da7f24ef3271a98abb7cc..738dc40ac533e97a7d1044ca60d8878fc79c1512 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Linux_Trusty.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_mojo_Chromium_Mojo_Linux.json
@@ -5,9 +5,9 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
- "chromium.fyi",
+ "chromium.mojo",
"--builder",
- "Linux Trusty",
+ "Chromium Mojo Linux",
"--slave",
"TestSlavename",
"--spec",
@@ -106,6 +106,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
},
@@ -124,7 +125,7 @@
"--paths",
"{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
"--properties",
- "{\"buildername\": \"Linux Trusty\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"Chromium Mojo Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.mojo\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
@@ -138,13 +139,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.mojo.json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mojo.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -162,6 +163,25 @@
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.mojo",
+ "-b",
+ "Chromium Mojo Linux",
+ "--config-file",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "//out/Release"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "generate_build_files"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[BUILD]/scripts/slave/compile.py",
"--target",
"Release",
@@ -176,7 +196,8 @@
"--goma-dir",
"[BUILD]/goma",
"--",
- "all"
+ "All",
+ "chromium_builder_tests"
],
"cwd": "[SLAVE_BUILD]",
"name": "compile",

Powered by Google App Engine
This is Rietveld 408576698