Run nacltest steps in mojob.py test (on linux)

On my linux z620 in debug mode this increases test time from 55s -> 1m5
which is pretty negligible. This code already builds by default on all
linux builds.

Also removes a stale dart-specific section. We run the dart
tests by default now and don't have a separate test list.

R=ncbray@chromium.org

Review URL: https://codereview.chromium.org/1125283009

mojo/tools/data/apptests

diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index a7fd68d..0c78344 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -67,6 +67,7 @@
   },
   {
     "test": "mojo:window_manager_apptests",
+    "shell-args": ["--args-for=mojo:native_viewport_service --use-headless-config --use-osmesa"],
   },
   {
     "test": "mojo:versioning_apptests",

mojo/tools/get_test_list.py

diff --git a/mojo/tools/get_test_list.py b/mojo/tools/get_test_list.py
index f9c4317..dedba5d 100755
--- a/mojo/tools/get_test_list.py
+++ b/mojo/tools/get_test_list.py
@@ -113,6 +113,20 @@
                            "run_mojo_python_bindings_tests.py"),
               "--build-dir=" + build_dir])
 
+  # NaCl tests (Linux only):
+  if target_os == Config.OS_LINUX and config.sanitizer != Config.SANITIZER_ASAN:
+    AddEntry("NaCl tests",
+             [os.path.join(build_dir, "monacl_shell"),
+              os.path.join(build_dir, "irt_" + config.target_cpu,
+                           "irt_mojo.nexe"),
+              os.path.join(build_dir, "clang_newlib_" + config.target_cpu,
+                           "monacl_test.nexe")])
+
+    AddXvfbEntry("NaCl app tests",
+                 [os.path.join("mojo", "tools", "apptest_runner.py"),
+                  os.path.join("mojo", "tools", "data", "nacl_apptests"),
+                  build_dir] + verbose_flags)
+
   # Sky tests (Linux-only):
   # TODO(abarth): Re-enabled in ASAN once the DartVM works in ASAN.
   # See https://code.google.com/p/dart/issues/detail?id=22122
@@ -177,35 +191,6 @@
               "--test_data=bindings:mojo/public/interfaces/bindings/tests/data"]
              + verbose_flags)
 
-  # Other (non-default) tests --------------------------------------------------
-
-  # Dart unit tests:
-  if ShouldRunTest("dart"):
-    AddXvfbEntry("Dart unit tests",
-                 [os.path.join("mojo", "tools", "test_runner.py"),
-                  os.path.join("mojo", "tools", "data", "dart_unittests"),
-                  build_dir, "mojob_test_successes"] + verbose_flags)
-    AddXvfbEntry("Dart App tests",
-                 [os.path.join("mojo", "tools", "apptest_runner.py"),
-                  os.path.join("mojo", "tools", "data", "dart_apptests"),
-                  build_dir] + verbose_flags)
-
-  # NaCl tests:
-  if ShouldRunTest("nacl"):
-    AddEntry("NaCl tests",
-             [os.path.join(build_dir, "monacl_shell"),
-              os.path.join(build_dir, "irt_" + config.target_cpu,
-                           "irt_mojo.nexe"),
-              os.path.join(build_dir, "clang_newlib_" + config.target_cpu,
-                           "monacl_test.nexe")])
-
-    AddXvfbEntry("NaCl app tests",
-                 [os.path.join("mojo", "tools", "apptest_runner.py"),
-                  os.path.join("mojo", "tools", "data", "nacl_apptests"),
-                  build_dir] + verbose_flags)
-
-  # ----------------------------------------------------------------------------
-
   return test_list
 
 

mojo/tools/mojob.py

diff --git a/mojo/tools/mojob.py b/mojo/tools/mojob.py
index d67c244..fbc0195 100755
--- a/mojo/tools/mojob.py
+++ b/mojo/tools/mojob.py
@@ -200,11 +200,6 @@
   return _run_tests(config, ['python'])
 
 
-def _nacltest(config):
-  _logger.debug('_nacltest()')
-  return _run_tests(config, ['nacl'])
-
-
 def main():
   os.chdir(Paths().src_root)
 
@@ -292,7 +287,7 @@
 
   nacltest_parser = subparsers.add_parser('nacltest', parents=[parent_parser],
       help='Run NaCl unit tests (does not build).')
-  nacltest_parser.set_defaults(func=_nacltest)
+  nacltest_parser.set_defaults(func=lambda config: 0)
 
   args = parser.parse_args()
   global _verbose_count