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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn_compile_failure.json

Issue 211473006: Add GN (the build tool) to the chromium.linux buildbots and try jobs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge to r260023 Created 6 years, 9 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
« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn_compile_failure.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/compile_failure_linux.json b/scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn_compile_failure.json
similarity index 69%
copy from scripts/slave/recipes/chromium_trybot.expected/compile_failure_linux.json
copy to scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn_compile_failure.json
index 235cd11a723bbe0f942a17d4930e36df95f37ac5..339521d84390d79881eea6c9991dec6da7a53ed0 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/compile_failure_linux.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn_compile_failure.json
@@ -35,6 +35,8 @@
"--nohooks",
"--delete_unversioned_trees",
"--force",
+ "--revision",
+ "src@HEAD",
"--output-json",
"/path/to/tmp/json"
],
@@ -117,7 +119,7 @@
"runhooks"
],
"env": {
- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
+ "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
},
"name": "gclient runhooks"
},
@@ -129,7 +131,7 @@
"-u",
"[BUILD]/scripts/slave/compile.py",
"--target",
- "Release",
+ "Debug",
"--src-dir",
"[SLAVE_BUILD]/src",
"--build-tool",
@@ -165,7 +167,27 @@
"sync_integration_tests",
"chrome"
],
- "name": "compile (with patch)",
+ "name": "compile (with patch)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[DEPOT_TOOLS]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Debug_gn",
+ "--args=is_debug=true"
+ ],
+ "name": "gn"
+ },
+ {
+ "cmd": [
+ "[DEPOT_TOOLS]/ninja",
+ "-C",
+ "[SLAVE_BUILD]/src/out/Debug_gn"
+ ],
+ "name": "compile (gn with patch)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
@@ -180,7 +202,8 @@
"--spec",
"cache_dir = None\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', 'safesync_url': 'https://build.chromium.org/p/chromium/lkcr-status/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]"
],
- "name": "gclient setup (2)"
+ "name": "gclient setup (2)",
+ "skip": true
},
{
"abort_on_failure": true,
@@ -191,7 +214,8 @@
".",
"[DEPOT_TOOLS]/gclient"
],
- "name": "gclient revert (2)"
+ "name": "gclient revert (2)",
+ "skip": true
},
{
"abort_on_failure": true,
@@ -203,41 +227,13 @@
"--nohooks",
"--delete_unversioned_trees",
"--force",
+ "--revision",
+ "src@HEAD",
"--output-json",
"/path/to/tmp/json"
],
"name": "gclient sync (2)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",
- "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
- ]
+ "skip": true
},
{
"abort_on_failure": true,
@@ -255,7 +251,8 @@
"https://codereview.chromium.org",
"--no-auth"
],
- "name": "apply_issue (2)"
+ "name": "apply_issue (2)",
+ "skip": true
},
{
"abort_on_failure": false,
@@ -265,7 +262,7 @@
"-u",
"[BUILD]/scripts/slave/compile.py",
"--target",
- "Release",
+ "Debug",
"--src-dir",
"[SLAVE_BUILD]/src",
"--build-tool",
@@ -303,10 +300,7 @@
"chrome"
],
"name": "compile (with patch, lkcr, clobber)",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_FAILURE@@@"
- ]
+ "skip": true
},
{
"cmd": [
@@ -320,16 +314,7 @@
"rmcontents slave build directory",
"gclient setup (3)"
],
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, shutil, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@for p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@",
- "@@@STEP_LOG_LINE@python.inline@ shutil.rmtree(p)@@@",
- "@@@STEP_LOG_LINE@python.inline@ else:@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "skip": true
},
{
"cmd": [
@@ -340,7 +325,8 @@
"--spec",
"cache_dir = None\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', 'safesync_url': 'https://build.chromium.org/p/chromium/lkcr-status/lkgr', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]"
],
- "name": "gclient setup (3)"
+ "name": "gclient setup (3)",
+ "skip": true
},
{
"abort_on_failure": true,
@@ -352,41 +338,13 @@
"--nohooks",
"--delete_unversioned_trees",
"--force",
+ "--revision",
+ "src@HEAD",
"--output-json",
"/path/to/tmp/json"
],
"name": "gclient sync (3)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 124383@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarm_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 200767@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",
- "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@"
- ]
+ "skip": true
},
{
"abort_on_failure": true,
@@ -409,7 +367,8 @@
"apply_issue (3)",
"gclient runhooks (2)",
"compile (with patch, lkcr, clobber, nuke)"
- ]
+ ],
+ "skip": true
},
{
"cmd": [
@@ -419,9 +378,10 @@
"runhooks"
],
"env": {
- "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
+ "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
},
- "name": "gclient runhooks (2)"
+ "name": "gclient runhooks (2)",
+ "skip": true
},
{
"abort_on_failure": true,
@@ -430,7 +390,7 @@
"-u",
"[BUILD]/scripts/slave/compile.py",
"--target",
- "Release",
+ "Debug",
"--src-dir",
"[SLAVE_BUILD]/src",
"--build-tool",
@@ -468,9 +428,38 @@
"chrome"
],
"name": "compile (with patch, lkcr, clobber, nuke)",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_FAILURE@@@"
- ]
+ "skip": true
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "\nimport os, shutil, sys\nfor p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:\n if os.path.isdir(p):\n shutil.rmtree(p)\n else:\n os.unlink(p)\n",
+ "[SLAVE_BUILD]/src/out/Debug_gn"
+ ],
+ "name": "rmcontents slave gn build directory",
+ "skip": true
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[DEPOT_TOOLS]/gn.py",
+ "--root=[SLAVE_BUILD]/src",
+ "gen",
+ "//out/Debug_gn",
+ "--args=is_debug=true"
+ ],
+ "name": "gn (2)",
+ "skip": true
+ },
+ {
+ "cmd": [
+ "[DEPOT_TOOLS]/ninja",
+ "-C",
+ "[SLAVE_BUILD]/src/out/Debug_gn"
+ ],
+ "name": "compile (gn with patch, lkcr, clobber)",
+ "skip": true
}
]
« scripts/slave/recipes/chromium_trybot.py ('K') | « scripts/slave/recipes/chromium_trybot.expected/unittest_should_run_gn.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698