From 7924492ce32a3b4b9ec7741babff1a13dbb7ab7a Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 18 Jan 2013 14:55:23 +0000 Subject: [PATCH] tools/run-tests.py: Fixes for Windows Review URL: https://codereview.chromium.org/11926015 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13436 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/mjsunit/testcfg.py | 2 +- tools/testrunner/local/testsuite.py | 3 +++ tools/testrunner/server/compression.py | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/mjsunit/testcfg.py b/test/mjsunit/testcfg.py index c8b972c..00d4500 100644 --- a/test/mjsunit/testcfg.py +++ b/test/mjsunit/testcfg.py @@ -75,7 +75,7 @@ class MjsunitTestSuite(testsuite.TestSuite): for f in files_list ] testfilename = os.path.join(self.root, testcase.path + self.suffix()) if SELF_SCRIPT_PATTERN.search(source): - env = ["-e", "TEST_FILE_NAME=\"%s\"" % testfilename] + env = ["-e", "TEST_FILE_NAME=\"%s\"" % testfilename.replace("\\", "\\\\")] files = env + files files.append(os.path.join(self.root, "mjsunit.js")) files.append(testfilename) diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py index de5cddd..473e8b1 100644 --- a/tools/testrunner/local/testsuite.py +++ b/tools/testrunner/local/testsuite.py @@ -30,6 +30,7 @@ import imp import os from . import statusfile +from . import utils class TestSuite(object): @@ -88,6 +89,8 @@ class TestSuite(object): used_rules = set() for t in self.tests: testname = self.CommonTestName(t) + if utils.IsWindows(): + testname = testname.replace("\\", "/") if testname in self.rules: used_rules.add(testname) outcomes = self.rules[testname] diff --git a/tools/testrunner/server/compression.py b/tools/testrunner/server/compression.py index ce90c4f..d5ed415 100644 --- a/tools/testrunner/server/compression.py +++ b/tools/testrunner/server/compression.py @@ -30,7 +30,6 @@ import cStringIO as StringIO try: import ujson as json except ImportError: - print("You should install UltraJSON, it is much faster!") import json import os import struct -- 2.7.4