Fixing the flakiness of the serialization tests by assuring that serializatio...

test/cctest/testcfg.py

 # 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
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
 import os
 from os.path import join, dirname, exists
 import platform
 import utils
 
 DEBUG_FLAGS = ['--enable-slow-asserts', '--debug-code', '--verify-heap']
 
 
 class CcTestCase(test.TestCase):
 
-  def __init__(self, path, executable, mode, raw_name, context):
+  def __init__(self, path, executable, mode, raw_name, dependency, context):
     super(CcTestCase, self).__init__(context, path)
     self.executable = executable
     self.mode = mode
     self.raw_name = raw_name
+    self.dependency = dependency
 
   def GetLabel(self):
     return "%s %s %s" % (self.mode, self.path[-2], self.path[-1])
 
   def GetName(self):
     return self.path[-1]
-
-  def GetCommand(self):
+    
+  def BuildCommand(self, name):
     serialization_file = join('obj', 'test', self.mode, 'serdes')
     serialization_option = '--testing_serialization_file=' + serialization_file
-    result = [ self.executable, self.raw_name, serialization_option ]
+    result = [ self.executable, name, serialization_option ]
     if self.mode == 'debug':
       result += DEBUG_FLAGS
     return result
 
+  def GetCommand(self):
+    return self.BuildCommand(self.raw_name)
+    
+  def Run(self):
+    if self.dependency != '':
+      dependent_command = self.BuildCommand(self.dependency)
+      self.RunCommand(dependent_command)

[Christian Plesner Hansen, 2009/02/03 08:21:16]

Consider checking that this command didn't fail and returning the command output
if it did.

[olehougaard, 2009/02/03 08:34:26]

Done

+    return test.TestCase.Run(self)
+
 
 class CcTestConfiguration(test.TestConfiguration):
 
   def __init__(self, context, root):
     super(CcTestConfiguration, self).__init__(context, root)
 
   def GetBuildRequirements(self):
     return ['cctests']
 
   def ListTests(self, current_path, path, mode):
     executable = join('obj', 'test', mode, 'cctest')
     if utils.IsWindows():
       executable += '.exe'
     output = test.Execute([executable, '--list'], self.context)
     if output.exit_code != 0:
       print output.stdout
       print output.stderr
       return []
     result = []
-    for raw_test in output.stdout.strip().split():
-      full_path = current_path + raw_test.split('/')
+    for test_desc in output.stdout.strip().split():
+      raw_test, dependency = test_desc.split('<')
+      relative_path = raw_test.split('/')
+      full_path = current_path + relative_path
+      if dependency != '':
+        dependency = relative_path[0] + '/' + dependency
       if self.Contains(path, full_path):
-        result.append(CcTestCase(full_path, executable, mode, raw_test, self.context))
+        result.append(CcTestCase(full_path, executable, mode, raw_test, dependency, self.context))
     return result
   
   def GetTestStatus(self, sections, defs):
     status_file = join(self.root, 'cctest.status')
     if exists(status_file):
       test.ReadConfigurationInto(status_file, sections, defs)
 
 
 def GetConfiguration(context, root):
   return CcTestConfiguration(context, root)