Only run the NaCl tests if the test type is DEFAULT, UNIT, or app.

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 62 matching lines @@
     return test_list
 
   # Tests run by default -------------------------------------------------------
 
   # C++ unit tests:
   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT):
     AddXvfbEntry("Unit tests",
                  [os.path.join("mojo", "tools", "test_runner.py"),
                   os.path.join("mojo", "tools", "data", "unittests"),
                   build_dir] + verbose_flags)
+    # 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")])
 
   # C++ app tests:
   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, "app"):
     AddXvfbEntry("App tests",
                  [os.path.join("mojo", "tools", "apptest_runner.py"),
                   os.path.join("mojo", "tools", "data", "apptests"),
                   build_dir] + verbose_flags)
+    # NaCl app tests (Linux only):
+    if (target_os == Config.OS_LINUX and
+        config.sanitizer != Config.SANITIZER_ASAN):
+      AddXvfbEntry("NaCl app tests",
+                   [os.path.join("mojo", "tools", "apptest_runner.py"),
+                    os.path.join("mojo", "tools", "data", "nacl_apptests"),
+                    build_dir] + verbose_flags)
 
   # Go unit tests (Linux-only):
   if (target_os == Config.OS_LINUX and
       config.sanitizer != Config.SANITIZER_ASAN and
       ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "go")):
     AddEntry("Go unit tests",
              [os.path.join(build_dir, "obj", "mojo", "go", "system_test")])
 
   # Python unit tests:
   if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "python"):
     AddEntry("Python unit tests",
              ["python", os.path.join("mojo", "tools",
               "run_mojo_python_tests.py")])
 
   # Python bindings tests (Linux-only):
   # See http://crbug.com/438781 for details on asan exclusion.
   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 67 matching lines @@
   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())