Nuke NaCl SFI, part 1.

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 68 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("SFI NaCl tests",
-               [os.path.join(build_dir, "monacl_shell_sfi"),
-                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)
     # Fusl app tests (Linux excluding Android):
     if (target_os == Config.OS_LINUX):
       AddXvfbEntry("Fusl app tests",
                    [os.path.join("mojo", "tools", "apptest_runner.py"),
                     os.path.join("mojo", "tools", "data", "fusl_apptests"),
                     build_dir] + verbose_flags)
     # Non-SFI NaCl app tests (Linux including Android, no asan):
     if config.sanitizer != Config.SANITIZER_ASAN:
       AddXvfbEntry("Non-SFI NaCl App tests",
                    [os.path.join("mojo", "tools", "apptest_runner.py"),
                     os.path.join("mojo", "tools", "data",
                                  "nacl_nonsfi_apptests"),
                     build_dir] + verbose_flags)
-    # NaCl app tests (Linux excluding Android):
-    if (target_os == Config.OS_LINUX and
-        config.sanitizer != Config.SANITIZER_ASAN):
-      # TODO(smklein): Add for Android once tests are pexes.
-      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")):
     # Go system tests:
     AddEntry("Go system tests",
              [os.path.join(build_dir, "obj", "mojo", "go", "system_test")],
              env={'GODEBUG' : 'cgocheck=2'})
 
@@ skipping 174 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())