diff options
| author | David Fugate <dfugate@microsoft.com> | 2012-01-19 16:03:21 -0800 |
|---|---|---|
| committer | David Fugate <dfugate@microsoft.com> | 2012-01-19 16:03:21 -0800 |
| commit | d7619456faaa7abcfe97aa68a2dfa4a6145d58b4 (patch) | |
| tree | 21dac0ecc516d2e45f2029fba70a9cf1de7eebca /tools | |
| parent | 98a0b9e10e3a0fc64dc69bf2b2dda84a4a28d359 (diff) | |
Generate one *.html per *.json in addition to the default.html which includes all tests.
Added support to create testcases_bestPractice.html without also adding them to default.html.
Preliminary support for tests under test/suite/internationalization has been added.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/packaging/packager.py | 12 | ||||
| -rw-r--r-- | tools/packaging/packagerConfig.py | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tools/packaging/packager.py b/tools/packaging/packager.py index 821e4acb4..caa05d901 100644 --- a/tools/packaging/packager.py +++ b/tools/packaging/packager.py @@ -201,9 +201,6 @@ for chapter in TEST_SUITE_SECTIONS: #create an array for tests in a chapter tests = [] sourceFiles = getAllJSFiles(chapter) - #TODO - do this only for the website!!! - for tempRe in WEBSITE_EXCLUDE_RE_LIST: - sourceFiles = [x for x in sourceFiles if tempRe.search(x)==None] if len(sourceFiles)!=0: excluded = 0 @@ -302,8 +299,13 @@ for chapter in TEST_SUITE_SECTIONS: chapterName.replace("ch", "Chapter ")) #add the name of the chapter test to our complete list - SECTIONS_LIST.append(WEBSITE_CASES_PATH + chapterName + ".json") - TOTAL_TEST_COUNT += int(sect["numTests"]) + tempBool = True + for tempRe in WEBSITE_EXCLUDE_RE_LIST: + if tempRe.search(chapterName)!=None: + tempBool = False + if tempBool: + SECTIONS_LIST.append(WEBSITE_CASES_PATH + chapterName + ".json") + TOTAL_TEST_COUNT += int(sect["numTests"]) #we now have the list of files for each chapter diff --git a/tools/packaging/packagerConfig.py b/tools/packaging/packagerConfig.py index ff0d83e05..348a6b245 100644 --- a/tools/packaging/packagerConfig.py +++ b/tools/packaging/packagerConfig.py @@ -33,7 +33,7 @@ CONSOLE_SHORT_NAME = "console" DEFAULT_TESTCASE_TEMPLATE="test262" ONE_JSON_PER_CHAPTER = False -TESTCASELIST_PER_JSON = False +TESTCASELIST_PER_JSON = True #Path to the root of the Hg repository (relative to this file's location) TEST262_ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__)), @@ -69,7 +69,7 @@ WEBSITE_CASES_PATH = "json/" EXCLUDED_FILENAME = os.path.join(TEST262_ROOT, "test", "config", "excludelist.xml") -WEBSITE_EXCLUDE_RE_LIST = ["bestPractice"] +WEBSITE_EXCLUDE_RE_LIST = ["bestPractice", "internationalization"] WEBSITE_EXCLUDE_RE_LIST = [ re.compile(x) for x in WEBSITE_EXCLUDE_RE_LIST] #------------------------------------------------------------------------------ |