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

tools/test.py

 #!/usr/bin/env python
 #
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 361 matching lines @@
     pass
 
   def AfterRun(self, result):
     pass
 
   def GetCustomFlags(self, mode):
     return None
 
   def Run(self):
     self.BeforeRun()
-    result = "exception"
     try:
       result = self.RunCommand(self.GetCommand())
     finally:
       self.AfterRun(result)
     return result
 
   def Cleanup(self):
     return
 
 
@@ skipping 184 matching lines @@
 
   def __init__(self, name):
     self.name = name
 
   def GetName(self):
     return self.name
 
 
 # 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):
 
   def __init__(self, path):
     normalized_path = abspath(path)
     super(TestRepository, self).__init__(basename(normalized_path))
     self.path = normalized_path
     self.is_loaded = False
     self.config = None
@@ skipping 712 matching lines @@
   else:
     pos = value.find('@')
     import urllib
     prefix = urllib.unquote(value[:pos]).split()
     suffix = urllib.unquote(value[pos+1:]).split()
     def ExpandCommand(args):
       return prefix + args + suffix
     return ExpandCommand
 
 
-BUILT_IN_TESTS = ['mjsunit', 'cctest', 'message', 'preparser']
+BUILT_IN_TESTS = ['mjsunit', 'cctest', 'message']
 
 
 def GetSuites(test_root):
   def IsSuite(path):
     return isdir(path) and exists(join(path, 'testcfg.py'))
   return [ f for f in os.listdir(test_root) if IsSuite(join(test_root, f)) ]
 
 
 def FormatTime(d):
   millis = round(d * 1000) % 1000
@@ skipping 72 matching lines @@
   root.GetTestStatus(context, sections, defs)
   config = Configuration(sections, defs)
 
   # List the tests
   all_cases = [ ]
   all_unused = [ ]
   unclassified_tests = [ ]
   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(),
         'arch': options.arch,
         'simulator': options.simulator,
         'crankshaft': options.crankshaft
       }
       test_list = root.ListTests([], path, context, mode, [])
       unclassified_tests += test_list
       (cases, unused_rules, all_outcomes) = config.ClassifyTests(test_list, env)
@@ skipping 56 matching lines @@
     for entry in timed_tests[:20]:
       t = FormatTime(entry.duration)
       sys.stderr.write("%4i (%s) %s\n" % (index, t, entry.GetLabel()))
       index += 1
 
   return result
 
 
 if __name__ == '__main__':
   sys.exit(Main())