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 96 matching lines @@
       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:
+  if (target_os == Config.OS_LINUX and
+      config.sanitizer != Config.SANITIZER_ASAN and
+      ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "app") ):

[viettrungluu, 2015/05/14 22:49:38]

nit: no space before second )

     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",

[jamesr, 2015/05/14 22:44:07]

maybe just this should be guarded by the "app" config?

[viettrungluu, 2015/05/14 22:49:38]

I agree.

(And probably "NaCl tests" shouldn't be run for "app", I guess.)

[rudominer, 2015/05/14 22:51:44]

How about if I move the AddEntry("Nacl tests") up into the section above where
we have AddXvbfEntry("Unit tests") (along with the check for Linux and !asan)
and similarly for the NaclAppTests.

                  [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):
@@ skipping 71 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())