Use full paths for cctests.

ager@chromium.org · ager@chromium.org · commit e181bd2b6f3e · 2011-03-16T11:16:18.000Z
Review URL: http://codereview.chromium.org/6670045 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7201 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py
@@ -41,8 +41,8 @@ def IsNumber(string):
 class BenchmarkTestCase(test.TestCase):
 
   def __init__(self, path, context, mode):
-    super(BenchmarkTestCase, self).__init__(context, path, mode)
-    self.root = '/'.join(self.path)
+    super(BenchmarkTestCase, self).__init__(context, split(path), mode)
+    self.root = path
 
   def GetLabel(self):
     return '%s benchmark %s' % (self.mode, self.GetName())
@@ -67,11 +67,10 @@ def GetName(self):
     return 'V8'
 
   def BeforeRun(self):
-    self.dir_before = os.getcwd()
     os.chdir(self.root)
 
   def AfterRun(self, result):
-    os.chdir(self.dir_before)
+    os.chdir(self.context.buildspace)
 
   def GetSource(self):
     return open(join(self.root, 'run.js')).read()
@@ -86,8 +85,8 @@ def __init__(self, context, root):
     super(BenchmarkTestConfiguration, self).__init__(context, root)
 
   def ListTests(self, current_path, path, mode):
-    path = self.root.split(os.path.sep)[:-2]
-    path.append('benchmarks')
+    path = self.context.workspace
+    path = join(path, 'benchmarks')
     test = BenchmarkTestCase(path, self.context, mode)
     return [test]
 
diff --git a/test/cctest/testcfg.py b/test/cctest/testcfg.py
@@ -49,6 +49,7 @@ def GetName(self):
   def BuildCommand(self, name):
     serialization_file = join('obj', 'test', self.mode, 'serdes')
     serialization_file += '_' + self.GetName()
+    serialization_file = join(self.context.buildspace, serialization_file)
     serialization_option = '--testing_serialization_file=' + serialization_file
     result = [ self.executable, name, serialization_option ]
     result += self.context.GetVmFlags(self, self.mode)
@@ -78,6 +79,7 @@ def ListTests(self, current_path, path, mode):
     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
