Let test configuration disable variant flags. Used for preparser tests.

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 374 matching lines @@
   def GetCustomFlags(self, mode):
     return None
 
   def Run(self):
     self.BeforeRun()
     result = None
     try:
       result = self.RunCommand(self.GetCommand())
     except:
       self.terminate = True
-      raise BreakNowException("Used pressed CTRL+C or IO went wrong")
+      raise BreakNowException("User pressed CTRL+C or IO went wrong")

[Rico, 2011/05/09 08:22:45]

thanks

     finally:
       self.AfterRun(result)
     return result
 
   def Cleanup(self):
     return
 
 
 class TestOutput(object):
 
@@ skipping 153 matching lines @@
   return CommandOutput(exit_code, False, "", "")
 
 
 def CarCdr(path):
   if len(path) == 0:
     return (None, [ ])
   else:
     return (path[0], path[1:])
 
 
+# Use this to run several variants of the tests, e.g.:
+# VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
+VARIANT_FLAGS = [[],
+                 ['--stress-opt', '--always-opt'],
+                 ['--nocrankshaft']]
+
+
 class TestConfiguration(object):
 
   def __init__(self, context, root):
     self.context = context
     self.root = root
 
   def Contains(self, path, file):
     if len(path) > len(file):
       return False
     for i in xrange(len(path)):
       if not path[i].match(file[i]):
         return False
     return True
 
   def GetTestStatus(self, sections, defs):
     pass
 
+  def VariantFlags(self):
+    return VARIANT_FLAGS
+
+
+
 
 class TestSuite(object):
 
   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']]
-
-
 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
 
   def GetConfiguration(self, context):
     if self.is_loaded:
       return self.config
     self.is_loaded = True
     file = None
     try:
       (file, pathname, description) = imp.find_module('testcfg', [ self.path ])
       module = imp.load_module('testcfg', file, pathname, description)
       self.config = module.GetConfiguration(context, self.path)
     finally:
       if file:
         file.close()
     return self.config
 
   def GetBuildRequirements(self, path, context):
     return self.GetConfiguration(context).GetBuildRequirements()
 
   def AddTestsToList(self, result, current_path, path, context, mode):
-    for v in VARIANT_FLAGS:
+    for v in self.GetConfiguration(context).VariantFlags():
       tests = self.GetConfiguration(context).ListTests(current_path, path, mode, v)
       for t in tests: t.variant_flags = v
       result += tests
 
-
   def GetTestStatus(self, context, sections, defs):
     self.GetConfiguration(context).GetTestStatus(sections, defs)
 
 
 class LiteralTestSuite(TestSuite):
 
   def __init__(self, tests):
     super(LiteralTestSuite, self).__init__('root')
     self.tests = tests
 
@@ skipping 851 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())