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

mojo/tools/get_test_list.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Central list of tests to run (as appropriate for a given config). Add tests
 to run by modifying this file.
 
 Note that this file is both imported (by mojob.py) and run directly (via a
 recipe)."""
@@ skipping 95 matching lines @@
   if (target_os == Config.OS_LINUX and
       ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT,
                     "python") and
       config.sanitizer != Config.SANITIZER_ASAN):
     AddEntry("Python bindings tests",
              ["python",
               os.path.join("mojo", "tools",
                            "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
   if (target_os == Config.OS_LINUX and
       ShouldRunTest(Config.TEST_TYPE_DEFAULT, "sky") and
       config.sanitizer != Config.SANITIZER_ASAN):
     sky_command = ["python",
                    "sky/tools/test_sky",
                    "-t", os.path.basename(build_dir),
                    "--no-new-test-results", "--no-show-results", "--verbose"]
@@ skipping 44 matching lines @@
       Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_INTEGRATION):
     AddEntry("Integration test (MojoTest)",
              ["python",
               os.path.join("build", "android", "test_runner.py"),
               "instrumentation",
               "--test-apk=MojoTest",
               "--output-directory=%s" % build_dir,
               "--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
 
 
 def main():
   parser = argparse.ArgumentParser(description="Gets tests to execute.")
   parser.add_argument("config_file", metavar="config.json",
                       type=argparse.FileType("rb"),
                       help="Input JSON file with test configuration.")
   parser.add_argument("test_list_file", metavar="test_list.json", nargs="?",
                       type=argparse.FileType("wb"), default=sys.stdout,
                       help="Output JSON file with test list.")
   args = parser.parse_args()
 
   config = Config(**json.load(args.config_file))
   test_list = GetTestList(config)
   json.dump(test_list, args.test_list_file, indent=2)
   args.test_list_file.write("\n")
 
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())