Reviewers: Rico,
Description:
Use full paths for cctests.
Please review this at http://codereview.chromium.org/6670045/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M test/benchmarks/testcfg.py
M test/cctest/testcfg.py
Index: test/benchmarks/testcfg.py
diff --git a/test/benchmarks/testcfg.py b/test/benchmarks/testcfg.py
index
a88bd93488554a1dba853212f11986f10409971d..f0ff15b1fa77a1ed994a1ae775db6c8130c8276e
100644
--- 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 @@ class BenchmarkTestCase(test.TestCase):
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 @@ class BenchmarkTestConfiguration(test.TestConfiguration):
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]
Index: test/cctest/testcfg.py
diff --git a/test/cctest/testcfg.py b/test/cctest/testcfg.py
index
b15342eda03930b6576f8ff94956a6695f2fdea2..8afdb36146c566dae3292df9d6ca53848b0a0860
100644
--- a/test/cctest/testcfg.py
+++ b/test/cctest/testcfg.py
@@ -49,6 +49,7 @@ class CcTestCase(test.TestCase):
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 @@ class CcTestConfiguration(test.TestConfiguration):
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
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
