aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Fugate <dfugate@microsoft.com>2011-09-25 15:37:56 -0700
committerDavid Fugate <dfugate@microsoft.com>2011-09-25 15:37:56 -0700
commit19ec143b0d77f890087cb7f61710d57af3b64a1e (patch)
tree8d32c0a8ad2ab04236d42907e6395f56389c0b35 /tools
parentba732a00d16ff6596cc80bf91a412f8c1a8e6b5f (diff)
Do not put 'best practice' tests on the live website.
Diffstat (limited to 'tools')
-rw-r--r--tools/packaging/packager.py5
-rw-r--r--tools/packaging/packagerConfig.py7
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/packaging/packager.py b/tools/packaging/packager.py
index 9f4139dc3..a7c11e1a9 100644
--- a/tools/packaging/packager.py
+++ b/tools/packaging/packager.py
@@ -172,7 +172,7 @@ def getAllJSFiles(dirName):
return retVal
#--MAIN------------------------------------------------------------------------
-for temp in TEST_CONTRIB_DIRS:
+for temp in os.listdir(TEST262_CASES_DIR):
temp = os.path.join(TEST262_CASES_DIR, temp)
if not os.path.exists(temp):
print "The expected ES5 test directory,", temp, "did not exist!"
@@ -195,6 +195,9 @@ 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
diff --git a/tools/packaging/packagerConfig.py b/tools/packaging/packagerConfig.py
index 6d2450304..f13d8f42b 100644
--- a/tools/packaging/packagerConfig.py
+++ b/tools/packaging/packagerConfig.py
@@ -22,16 +22,13 @@
import os
import subprocess
import stat
+import re
#--Globals---------------------------------------------------------------------
MAX_CASES_PER_JSON = 1000
WEBSITE_SHORT_NAME = "website"
-#Directories under "test\suite\" containing ES5 test chapter directories
-#with *.js tests underneath them
-TEST_CONTRIB_DIRS = ["converted"]
-
#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__)), "..", "..")
TEST262_ROOT = os.path.abspath(TEST262_ROOT)
@@ -56,6 +53,8 @@ WEBSITE_CASES_PATH = "json/"
#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")
+WEBSITE_EXCLUDE_RE_LIST = ["bestPractice"]
+WEBSITE_EXCLUDE_RE_LIST = [ re.compile(x) for x in WEBSITE_EXCLUDE_RE_LIST]
#------------------------------------------------------------------------------