diff options
| author | Brian Terlson <brian.terlson@microsoft.com> | 2014-12-07 15:42:12 -0800 |
|---|---|---|
| committer | Brian Terlson <brian.terlson@microsoft.com> | 2014-12-07 15:42:12 -0800 |
| commit | 47821a8bd040feabb86c4c56bc9f2d3a56bc0061 (patch) | |
| tree | 791691390a5722cb18086b2410478db80de0cd37 /tools/packaging | |
| parent | 2a74f0ec1b671f15fc7df3e1e294a65abc8ebac8 (diff) | |
| download | qtdeclarative-testsuites-47821a8bd040feabb86c4c56bc9f2d3a56bc0061.tar.gz | |
Update python scripts for new paths
Diffstat (limited to 'tools/packaging')
| -rw-r--r-- | tools/packaging/packagerConfig.py | 7 | ||||
| -rwxr-xr-x | tools/packaging/test262.py | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/packaging/packagerConfig.py b/tools/packaging/packagerConfig.py index adbd25320..c55a41e18 100644 --- a/tools/packaging/packagerConfig.py +++ b/tools/packaging/packagerConfig.py @@ -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 #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 #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) 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 #disabled in test262. These tests are either invalid as-per ES5 or #have issues with the test262 web harness. -EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "config", - "excludelist.xml") +EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "excludelist.xml") WEBSITE_EXCLUDE_RE_LIST = ["bestPractice", "intl402"] WEBSITE_EXCLUDE_RE_LIST = [ re.compile(x) for x in WEBSITE_EXCLUDE_RE_LIST] diff --git a/tools/packaging/test262.py b/tools/packaging/test262.py index 38b43505e..9a5481827 100755 --- a/tools/packaging/test262.py +++ b/tools/packaging/test262.py @@ -392,8 +392,8 @@ class TestSuite(object): def __init__(self, root, strict_only, non_strict_only, unmarked_default, print_handle): # TODO: derive from packagerConfig.py - self.test_root = path.join(root, 'test', 'suite') - self.lib_root = path.join(root, 'test', 'harness') + self.test_root = path.join(root, 'test') + self.lib_root = path.join(root, 'harness') self.strict_only = strict_only self.non_strict_only = non_strict_only self.unmarked_default = unmarked_default |