Revert "[Arguments] Merge (7442,7496] from bleeding_edge."

tools/test.py

Index: tools/test.py
diff --git a/tools/test.py b/tools/test.py
index 707e7254de97506fbf694ee039fea4869e47eb2e..066a55934edc4476c1d9166ba5137f23ed34eb9a 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -379,7 +379,6 @@ class TestCase(object):
 
   def Run(self):
     self.BeforeRun()
-    result = "exception"
     try:
       result = self.RunCommand(self.GetCommand())
     finally:
@@ -584,9 +583,7 @@ class TestSuite(object):
 
 # Use this to run several variants of the tests, e.g.:
 # VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
-VARIANT_FLAGS = [[],
-                 ['--stress-opt', '--always-opt'],
-                 ['--nocrankshaft']]
+VARIANT_FLAGS = [[], ['--stress-opt', '--always-opt'], ['--nocrankshaft']]
 
 
 class TestRepository(TestSuite):
@@ -1319,7 +1316,7 @@ def GetSpecialCommandProcessor(value):
     return ExpandCommand
 
 
-BUILT_IN_TESTS = ['mjsunit', 'cctest', 'message', 'preparser']
+BUILT_IN_TESTS = ['mjsunit', 'cctest', 'message']
 
 
 def GetSuites(test_root):
@@ -1412,6 +1409,9 @@ def Main():
   globally_unused_rules = None
   for path in paths:
     for mode in options.mode:
+      if not exists(context.GetVm(mode)):
+        print "Can't find shell executable: '%s'" % context.GetVm(mode)
+        continue
       env = {
         'mode': mode,
         'system': utils.GuessOS(),