Update python scripts for new paths

This commit is contained in:
Brian Terlson 2014-12-07 15:42:12 -08:00
parent 2a74f0ec1b
commit 47821a8bd0
2 changed files with 5 additions and 6 deletions

View File

@ -28,11 +28,11 @@ TEST262_ROOT = os.path.abspath(TEST262_ROOT)
#Directory full of test cases we want to port to the website's test #Directory full of test cases we want to port to the website's test
#harness runner #harness runner
TEST262_CASES_DIR = os.path.join(TEST262_ROOT, "test", "suite") TEST262_CASES_DIR = os.path.join(TEST262_ROOT, "test")
#Directory containing test harness files to be ported over to the #Directory containing test harness files to be ported over to the
#website. Note that only *.js files will be migrated from this dir. #website. Note that only *.js files will be migrated from this dir.
TEST262_HARNESS_DIR = os.path.join(TEST262_ROOT, "test", "harness") TEST262_HARNESS_DIR = os.path.join(TEST262_ROOT, "harness")
#Directory full of website test cases (ported over from TEST262_CASES_DIR) #Directory full of website test cases (ported over from TEST262_CASES_DIR)
TEST262_WEB_CASES_DIR = os.path.join(TEST262_ROOT, WEBSITE_SHORT_NAME, "json") TEST262_WEB_CASES_DIR = os.path.join(TEST262_ROOT, WEBSITE_SHORT_NAME, "json")
@ -52,8 +52,7 @@ WEBSITE_CASES_PATH = "json/"
#The name of a file which contains a list of tests which should be #The name of a file which contains a list of tests which should be
#disabled in test262. These tests are either invalid as-per ES5 or #disabled in test262. These tests are either invalid as-per ES5 or
#have issues with the test262 web harness. #have issues with the test262 web harness.
EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "config", EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "excludelist.xml")
"excludelist.xml")
WEBSITE_EXCLUDE_RE_LIST = ["bestPractice", "intl402"] WEBSITE_EXCLUDE_RE_LIST = ["bestPractice", "intl402"]
WEBSITE_EXCLUDE_RE_LIST = [ re.compile(x) for x in WEBSITE_EXCLUDE_RE_LIST] WEBSITE_EXCLUDE_RE_LIST = [ re.compile(x) for x in WEBSITE_EXCLUDE_RE_LIST]

View File

@ -392,8 +392,8 @@ class TestSuite(object):
def __init__(self, root, strict_only, non_strict_only, unmarked_default, print_handle): def __init__(self, root, strict_only, non_strict_only, unmarked_default, print_handle):
# TODO: derive from packagerConfig.py # TODO: derive from packagerConfig.py
self.test_root = path.join(root, 'test', 'suite') self.test_root = path.join(root, 'test')
self.lib_root = path.join(root, 'test', 'harness') self.lib_root = path.join(root, 'harness')
self.strict_only = strict_only self.strict_only = strict_only
self.non_strict_only = non_strict_only self.non_strict_only = non_strict_only
self.unmarked_default = unmarked_default self.unmarked_default = unmarked_default