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

Unified Diff: mojo/tools/data/unittests

Issue 888043002: Use a python script to configure unit tests and app tests to run. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow review Created 5 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
« no previous file with comments | « mojo/tools/data/apptests ('k') | mojo/tools/mopy/config.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/data/unittests
diff --git a/mojo/tools/data/unittests b/mojo/tools/data/unittests
index c9fe777ff6e9dbe960ba5ed3047b21fed29a48a5..5046b746c8d09a61711287053c8721a43cf6c128 100644
--- a/mojo/tools/data/unittests
+++ b/mojo/tools/data/unittests
@@ -1,7 +1,10 @@
# This file contains a list of Mojo gtest unit tests.
-# This must be a valid python dictionary.
+# This must be valid python. It can use the |config| global that will be a
+# mopy.config.Config object and must set a |tests| global that will contain the
+# tests to run.
# TODO(vtl): Add a way of specifying data dependencies instead of cacheable.
-[
+
+tests = [
# System tests:
{
"test": "mojo_system_unittests",
@@ -45,36 +48,34 @@
"test": "window_manager_unittests",
},
- # Tests for components we depend on:
- {
- "test": "gfx_unittests",
- "target_os": ["!android"],
- },
- {
- "test": "events_unittests",
- "target_os": ["!android"],
- },
-
- # JavaScript tests:
- {
- "test": "js_unittests",
- "cacheable": False,
- "target_os": ["!android"],
- },
- {
- "test": "js_integration_tests",
- "cacheable": False,
- "target_os": ["!android"],
- },
- {
- "test": "js_services_unittests",
- "cacheable": False,
- "target_os": ["!android"],
- },
-
# Shell integration tests:
{
"test": "mojo_shell_tests",
"cacheable": False,
},
]
+
+if config.target_os != config.OS_ANDROID:
+ tests += [
+ # Tests for components we depend on:
+ {
+ "test": "gfx_unittests",
+ },
+ {
+ "test": "events_unittests",
+ },
+
+ # JavaScript tests:
+ {
+ "test": "js_unittests",
+ "cacheable": False,
+ },
+ {
+ "test": "js_integration_tests",
+ "cacheable": False,
+ },
+ {
+ "test": "js_services_unittests",
+ "cacheable": False,
+ },
+ ]
« no previous file with comments | « mojo/tools/data/apptests ('k') | mojo/tools/mopy/config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698