summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorpetermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 20:14:31 +0000
committerpetermayo@chromium.org <petermayo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 20:14:31 +0000
commit80dae2649a7eac7947df44d5d3d170f528a92c18 (patch)
tree439361c703f9dbc9500025a180152acfdf17057c /testing
parent2f60c9b74db6c61424a5a9c731acef26a9260c9c (diff)
downloadchromium_src-80dae2649a7eac7947df44d5d3d170f528a92c18.zip
chromium_src-80dae2649a7eac7947df44d5d3d170f528a92c18.tar.gz
chromium_src-80dae2649a7eac7947df44d5d3d170f528a92c18.tar.bz2
Add athena_unittests to chromiumos
R=phajdan.jr@chromium.org, oshima@chromium.org BUG=375537 TEST=Trybots Review URL: https://codereview.chromium.org/314863004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.chromiumos.json4
-rw-r--r--testing/buildbot/chromium_trybot.json5
2 files changed, 8 insertions, 1 deletions
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 8c9aa5c..acc1d94 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -33,7 +33,8 @@
"sync_unit_tests",
"unit_tests",
"sql_unittests",
- "nacl_loader_unittests"
+ "nacl_loader_unittests",
+ "athena_unittests"
]
},
"Linux ChromiumOS Tests (2)": {
@@ -90,6 +91,7 @@
},
"Linux ChromiumOS Tests (dbg)(3)": {
"gtest_tests": [
+ "athena_unittests",
"gcm_unit_tests",
"interactive_ui_tests",
{"test": "browser_tests", "shard_index": 2, "total_shards": 3}
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 9498ef3..ff557b8 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -117,6 +117,11 @@
"test": "chromeos_unittests",
"platforms": ["linux"],
"chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+ },
+ {
+ "test": "athena_unittests",
+ "platforms": ["linux"],
+ "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
}
]
}