Use a python script to configure unit tests and app tests to run.

mojo/tools/data/unittests

Index: mojo/tools/data/unittests
diff --git a/mojo/tools/data/unittests b/mojo/tools/data/unittests
index c9fe777ff6e9dbe960ba5ed3047b21fed29a48a5..5b2102dc3e8af3d0161c043bfe6c83e6b01762e9 100644
--- a/mojo/tools/data/unittests
+++ b/mojo/tools/data/unittests
@@ -1,7 +1,12 @@
 # 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.
-[
+
+from mopy.config import Config

[viettrungluu, 2015/01/30 20:43:27]

...

[qsr, 2015/02/03 10:44:25]

Same thing. Will change if you insist, but I think the import makes sense here.

+
+tests = [
   # System tests:
   {
     "test": "mojo_system_unittests",
@@ -45,36 +50,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,
+    },
+  ]