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

Unified Diff: mojo/tools/data/apptests

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: Created 5 years, 11 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
Index: mojo/tools/data/apptests
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index f082e3f61147d360e2afa521f8ff10b544361169..0ee82ad882a948bbdb3d154932271c68285410f0 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -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|msw): Add a way of specifying data dependencies.
-[
+
+from mopy.config import Config
+
+tests = [
{
"test": "mojo:clipboard_apptests",
},
@@ -11,38 +16,43 @@
"test-args": ["--example_apptest_arg"],
},
{
- # Runs mojo:example_apptests, replacing the mojo:example_service dependency
- # with the alternate test:example_service, launched via mojo launcher."
- "test": "mojo:example_apptests",
- # ExampleApplicationTest.CheckCommandLineArg checks --example_apptest_arg.
- "test-args": ["--example_apptest_arg"],
- "shell-args": ["--url-mappings=mojo:example_service=test:example_service"],
- "launched-services": ["test:example_service"],
- "target_os": ["!android"],
- },
- {
"test": "mojo:network_service_apptests",
},
{
- "test": "mojo:example_apptests",
- # ExampleApplicationTest.CheckCommandLineArg checks --example_apptest_arg.
- "test-args": ["--example_apptest_arg"],
- "shell-args": ["--url-mappings=mojo:example_service=mojo:python_example_service"],
- "target_os": ["!*", "linux"],
- },
- {
"test": "mojo:view_manager_service_apptests",
"shell-args": ["--args-for=mojo:native_viewport_service --use-headless-config --use-osmesa"],
},
{
- "test": "mojo:js_apptests",
- "target_os": ["!android"],
- },
- {
"test": "mojo:window_manager_apptests",
},
- {
- "test": "mojo:reaper_apptests",
- "target_os": ["!android"],
- },
]
+
+if config.target_os == Config.OS_LINUX:
viettrungluu 2015/01/30 20:43:27 You should be able to just use config.OS_LINUX (an
qsr 2015/02/03 10:44:25 It will work, but any reason I would want to? This
+ tests+= [
viettrungluu 2015/01/30 20:43:27 nit: space before "+="
qsr 2015/02/03 10:44:25 Done.
+ {
+ "test": "mojo:example_apptests",
+ # ExampleApplicationTest.CheckCommandLineArg checks --example_apptest_arg.
+ "test-args": ["--example_apptest_arg"],
+ "shell-args": ["--url-mappings=mojo:example_service=mojo:python_example_service"],
viettrungluu 2015/01/30 20:43:27 Arguably, you should wrap to fit in 80 columns.
qsr 2015/02/03 10:44:25 Done.
+ },
+ ]
+
+if config.target_os != Config.OS_ANDROID:
+ tests+= [
viettrungluu 2015/01/30 20:43:27 ...
qsr 2015/02/03 10:44:25 Done.
+ {
+ # Runs mojo:example_apptests, replacing the mojo:example_service
+ # dependency with the alternate test:example_service, launched via mojo
+ # launcher."
+ "test": "mojo:example_apptests",
+ # ExampleApplicationTest.CheckCommandLineArg checks --example_apptest_arg.
+ "test-args": ["--example_apptest_arg"],
+ "shell-args": ["--url-mappings=mojo:example_service=test:example_service"],
viettrungluu 2015/01/30 20:43:27 ...
qsr 2015/02/03 10:44:25 Done.
+ "launched-services": ["test:example_service"],
+ },
+ {
+ "test": "mojo:js_apptests",
+ },
+ {
+ "test": "mojo:reaper_apptests",
+ },
+ ]

Powered by Google App Engine
This is Rietveld 408576698