From 47821a8bd040feabb86c4c56bc9f2d3a56bc0061 Mon Sep 17 00:00:00 2001
From: Brian Terlson <brian.terlson@microsoft.com>
Date: Sun, 7 Dec 2014 15:42:12 -0800
Subject: [PATCH] Update python scripts for new paths
---
tools/packaging/packagerConfig.py | 7 +++----
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 adbd253203..c55a41e187 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 38b43505ed..9a54818273 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
--
GitLab