summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 15:23:59 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-06 15:23:59 +0000
commit63689b2cd7495cb90038f9dbf637e5b209cb1345 (patch)
tree15c3279246957062a9fe320ddad706673d25aeb9 /testing
parentfa7b5d5e41c8fcad154266563eec1df4276150bb (diff)
downloadchromium_src-63689b2cd7495cb90038f9dbf637e5b209cb1345.zip
chromium_src-63689b2cd7495cb90038f9dbf637e5b209cb1345.tar.gz
chromium_src-63689b2cd7495cb90038f9dbf637e5b209cb1345.tar.bz2
Run nacl_loader_unittests on trybots and waterfall bots
This test does nothing on Mac or Windows, so we do not add this to them. TEST=trybot BUG=364751 Review URL: https://codereview.chromium.org/253273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.chromiumos.json6
-rw-r--r--testing/buildbot/chromium.linux.json6
-rw-r--r--testing/buildbot/chromium_trybot.json4
3 files changed, 12 insertions, 4 deletions
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index e9797eb..b6575d5 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -32,7 +32,8 @@
"ipc_tests",
"sync_unit_tests",
"unit_tests",
- "sql_unittests"
+ "sql_unittests",
+ "nacl_loader_unittests"
]
},
"Linux ChromiumOS Tests (2)": {
@@ -75,7 +76,8 @@
"ipc_tests",
"sync_unit_tests",
"unit_tests",
- "sql_unittests"
+ "sql_unittests",
+ "nacl_loader_unittests"
]
},
"Linux ChromiumOS Tests (dbg)(2)": {
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 8195c87..acedd4d 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -196,7 +196,8 @@
"mojo_public_system_unittests",
"mojo_public_utility_unittests",
"mojo_service_manager_unittests",
- "mojo_system_unittests"
+ "mojo_system_unittests",
+ "nacl_loader_unittests"
]
},
"Linux Clang (dbg)": {
@@ -221,7 +222,8 @@
"mojo_public_system_unittests",
"mojo_public_utility_unittests",
"mojo_service_manager_unittests",
- "mojo_system_unittests"
+ "mojo_system_unittests",
+ "nacl_loader_unittests"
]
}
}
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 1401b7d..410f4d7 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -40,6 +40,10 @@
"mojo_public_utility_unittests",
"mojo_service_manager_unittests",
"mojo_system_unittests",
+ {
+ "test": "nacl_loader_unittests",
+ "platforms": ["linux"]
+ },
"net_unittests",
"ppapi_unittests",
"printing_unittests",