Revert "Make GYP build usable for day-to-day work"

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 30 matching lines @@
     self.dependency = dependency
     self.variant_flags = variant_flags
 
   def GetLabel(self):
     return "%s %s %s" % (self.mode, self.path[-2], self.path[-1])
 
   def GetName(self):
     return self.path[-1]
 
   def BuildCommand(self, name):
-    serialization_file = ''
-    if exists(join(self.context.buildspace, 'obj', 'test', self.mode)):
-      serialization_file = join('obj', 'test', self.mode, 'serdes')
-    else:
-      serialization_file = join('obj', 'serdes')
+    serialization_file = join('obj', 'test', self.mode, 'serdes')
     serialization_file += '_' + self.GetName()
     serialization_file = join(self.context.buildspace, serialization_file)
     serialization_file += ''.join(self.variant_flags).replace('-', '_')
     serialization_option = '--testing_serialization_file=' + serialization_file
     result = [ self.executable, name, serialization_option ]
     result += self.context.GetVmFlags(self, self.mode)
     return result
 
   def GetCommand(self):
     return self.BuildCommand(self.raw_name)
 
   def Run(self):
     if self.dependency != '':
       dependent_command = self.BuildCommand(self.dependency)
       output = self.RunCommand(dependent_command)
       if output.HasFailed():
         return output
     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, variant_flags):
-    executable = 'cctest'
+    executable = join('obj', 'test', mode, 'cctest')
     if utils.IsWindows():
       executable += '.exe'
     executable = join(self.context.buildspace, executable)
-    if not exists(executable):
-      executable = join('obj', 'test', mode, 'cctest')
-      if utils.IsWindows():
-        executable += '.exe'
-      executable = join(self.context.buildspace, executable)
     output = test.Execute([executable, '--list'], self.context)
     if output.exit_code != 0:
       print output.stdout
       print output.stderr
       return []
     result = []
     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, dependency, self.context, variant_flags))
     result.sort()
     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)