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

mojo/tools/get_test_list.py

Index: mojo/tools/get_test_list.py
diff --git a/mojo/tools/get_test_list.py b/mojo/tools/get_test_list.py
index f9c43174ff5dd227037c5fe0ac3aa8345df24362..dedba5d8db2af10d2b24115187b8237debd2cf36 100755
--- a/mojo/tools/get_test_list.py
+++ b/mojo/tools/get_test_list.py
@@ -113,6 +113,20 @@ def GetTestList(config, verbose_count=0):
                            "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 @@ def GetTestList(config, verbose_count=0):
               "--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