summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorDirk Pranke <dpranke@chromium.org>2015-04-14 16:37:44 -0700
committerDirk Pranke <dpranke@chromium.org>2015-04-14 23:38:17 +0000
commit320396a03b1fe754c83dfb54741a8027ebe10090 (patch)
tree7ac3aae0d40a44250c51f6d5e8a452772b22462f /testing
parent558d7e4caf9398bd694fd8d9f28ff952b8952d43 (diff)
downloadchromium_src-320396a03b1fe754c83dfb54741a8027ebe10090.zip
chromium_src-320396a03b1fe754c83dfb54741a8027ebe10090.tar.gz
chromium_src-320396a03b1fe754c83dfb54741a8027ebe10090.tar.bz2
Add GN bot entries to testing/buildbot/chromium.webkit.json.
And also fix the 'additional_compile_targets' entries for the Android GN bots. TBR=phajdan.jr@chromium.org BUG=454413 Review URL: https://codereview.chromium.org/1061973005 Cr-Commit-Position: refs/heads/master@{#325151}
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.linux.json2
-rw-r--r--testing/buildbot/chromium.webkit.json40
2 files changed, 41 insertions, 1 deletions
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 2738e38..93ac490 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -1,7 +1,7 @@
{
"Android GN": {
"additional_compile_targets": [
- "all"
+ "chrome_shell_apk"
],
"gtest_tests": [
{
diff --git a/testing/buildbot/chromium.webkit.json b/testing/buildbot/chromium.webkit.json
index 5bcdfa7..dcf8e76 100644
--- a/testing/buildbot/chromium.webkit.json
+++ b/testing/buildbot/chromium.webkit.json
@@ -1,4 +1,24 @@
{
+ "Android GN": {
+ "additional_compile_targets": [
+ "chrome_shell_apk"
+ ],
+ "gtest_tests": [
+ {
+ "test": "base_unittests"
+ }
+ ]
+ },
+ "Android GN (dbg)": {
+ "additional_compile_targets": [
+ "chrome_shell_apk"
+ ],
+ "gtest_tests": [
+ {
+ "test": "base_unittests"
+ }
+ ]
+ },
"Linux ChromiumOS Tests (1)": {
"gtest_tests": [
{
@@ -356,6 +376,26 @@
"Linux ChromiumOS Tests (dbg)(3)": {
"gtest_tests": []
},
+ "Linux GN": {
+ "additional_compile_targets": [
+ "all"
+ ],
+ "gtest_tests": [
+ {
+ "test": "base_unittests"
+ }
+ ]
+ },
+ "Linux GN (dbg)": {
+ "additional_compile_targets": [
+ "all"
+ ],
+ "gtest_tests": [
+ {
+ "test": "base_unittests"
+ }
+ ]
+ },
"WebKit Linux": {
"gtest_tests": [
{