mirror of https://github.com/tc39/test262.git
More cleanup on TestCasePackager.py.
This commit is contained in:
David Fugate
parent
31e2bcacf6
commit
ba59cf13be
|
|
@ -55,6 +55,16 @@ TEST_CONTRIB_DIRS = ["sputnik_converted", "ietestcenter"]
|
||||||
#a list of all ES5 test chapter directories
|
#a list of all ES5 test chapter directories
|
||||||
TEST_SUITE_SECTIONS = []
|
TEST_SUITE_SECTIONS = []
|
||||||
|
|
||||||
|
#total number of tests accross the entire set of tests.
|
||||||
|
TOTAL_TEST_COUNT = 0
|
||||||
|
|
||||||
|
#global which states whether the test case we're currently processing is in
|
||||||
|
#the midst of a "/* ... */" style comment
|
||||||
|
IS_MULTILINE_COMMENT = False
|
||||||
|
|
||||||
|
#List of all *.json files containing encoded test cases
|
||||||
|
SECTIONS_LIST = []
|
||||||
|
|
||||||
#--Sanity checks--------------------------------------------------------------#
|
#--Sanity checks--------------------------------------------------------------#
|
||||||
if not os.path.exists(TEST262_CASES_DIR):
|
if not os.path.exists(TEST262_CASES_DIR):
|
||||||
print "Cannot generate (JSON) test262 tests when the path containing said tests, %s, does not exist!" % TEST262_CASES_DIR
|
print "Cannot generate (JSON) test262 tests when the path containing said tests, %s, does not exist!" % TEST262_CASES_DIR
|
||||||
|
|
@ -95,6 +105,10 @@ def getJSCount(dirName):
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
def dirWalker(dirName):
|
def dirWalker(dirName):
|
||||||
|
'''
|
||||||
|
Populates TEST_SUITE_SECTIONS with ES5 test directories based
|
||||||
|
upon the number of test files per directory.
|
||||||
|
'''
|
||||||
global TEST_SUITE_SECTIONS
|
global TEST_SUITE_SECTIONS
|
||||||
#First check to see if it has test files directly inside it
|
#First check to see if it has test files directly inside it
|
||||||
temp = [os.path.join(dirName, x) for x in os.listdir(dirName) if not os.path.isdir(os.path.join(dirName, x))]
|
temp = [os.path.join(dirName, x) for x in os.listdir(dirName) if not os.path.isdir(os.path.join(dirName, x))]
|
||||||
|
|
@ -118,34 +132,23 @@ def dirWalker(dirName):
|
||||||
dirWalker(os.path.join(dirName, tempSubdir))
|
dirWalker(os.path.join(dirName, tempSubdir))
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
for tempDirName in TEST_CONTRIB_DIRS:
|
|
||||||
if not os.path.exists(os.path.join(TEST262_CASES_DIR, tempDirName)):
|
|
||||||
print "The expected ES5 test directory, TEST262_CASES_DIR\$tempDirName, did not exist!"
|
|
||||||
sys.exit(1)
|
|
||||||
dirWalker(os.path.join(TEST262_CASES_DIR, tempDirName))
|
|
||||||
|
|
||||||
NUM_TESTS = 0
|
|
||||||
#total number of tests accross the entire set of tests.
|
|
||||||
TOTAL_TEST_COUNT = 0
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#--HELPERS---------------------------------------------------------------------
|
|
||||||
multilineComment = False
|
|
||||||
|
|
||||||
def isTestStarted(line):
|
def isTestStarted(line):
|
||||||
#Note this is a naive approach on the sense that "/*abc*/" could be on one
|
'''
|
||||||
#line. However, we know for a fact this is not the case in IE Test Center
|
Used to detect if we've gone past extraneous test comments in a test case.
|
||||||
#or Sputnik tests.
|
|
||||||
global multilineComment
|
Note this is a naive approach on the sense that "/*abc*/" could be on one
|
||||||
|
line. However, we know for a fact this is not the case in IE Test Center
|
||||||
|
or Sputnik tests.
|
||||||
|
'''
|
||||||
|
global IS_MULTILINE_COMMENT
|
||||||
|
|
||||||
if multilineComment and ("*/" in line): #End of a newline comment
|
if IS_MULTILINE_COMMENT and ("*/" in line): #End of a newline comment
|
||||||
multilineComment = False
|
IS_MULTILINE_COMMENT = False
|
||||||
return False
|
return False
|
||||||
elif "/*" in line: #Beginning of a newline comment
|
elif "/*" in line: #Beginning of a newline comment
|
||||||
multilineComment = True
|
IS_MULTILINE_COMMENT = True
|
||||||
return False
|
return False
|
||||||
elif multilineComment: #//we're already in a multi-line comment that hasn't ended
|
elif IS_MULTILINE_COMMENT: #//we're already in a multi-line comment that hasn't ended
|
||||||
return False
|
return False
|
||||||
elif "//" in line: #//blah
|
elif "//" in line: #//blah
|
||||||
return False
|
return False
|
||||||
|
|
@ -155,33 +158,38 @@ def isTestStarted(line):
|
||||||
return True
|
return True
|
||||||
return True
|
return True
|
||||||
|
|
||||||
#--MAIN------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
testSuite = []
|
|
||||||
count = 0
|
|
||||||
|
|
||||||
def getAllJSFiles(dirName):
|
def getAllJSFiles(dirName):
|
||||||
retVal = []
|
retVal = []
|
||||||
for fullPath,dontCare,files in os.walk(dirName):
|
for fullPath,dontCare,files in os.walk(dirName):
|
||||||
retVal += [os.path.join(fullPath,b) for b in files if b.endswith(".js")]
|
retVal += [os.path.join(fullPath,b) for b in files if b.endswith(".js")]
|
||||||
return retVal
|
return retVal
|
||||||
|
|
||||||
|
#--MAIN------------------------------------------------------------------------
|
||||||
|
for temp in TEST_CONTRIB_DIRS:
|
||||||
|
temp = os.path.join(TEST262_CASES_DIR, temp)
|
||||||
|
if not os.path.exists(temp):
|
||||||
|
print "The expected ES5 test directory,", temp, "did not exist!"
|
||||||
|
sys.exit(1)
|
||||||
|
dirWalker(temp)
|
||||||
|
|
||||||
for chapter in TEST_SUITE_SECTIONS:
|
for chapter in TEST_SUITE_SECTIONS:
|
||||||
chapterName = chapter.rsplit(os.path.sep, 1)[1]
|
chapterName = chapter.rsplit(os.path.sep, 1)[1]
|
||||||
print "Generating test cases for ES5 chapter:", chapterName
|
print "Generating test cases for ES5 chapter:", chapterName
|
||||||
#create dictionaries for all our tests and a section
|
#create dictionaries for all our tests and a section
|
||||||
testsList = {}
|
testsList = {}
|
||||||
sect = {}
|
sect = {}
|
||||||
|
sect["name"] = "Chapter - " + chapterName
|
||||||
|
|
||||||
sectionName ="Chapter - " + chapterName
|
|
||||||
sect["name"] = sectionName
|
|
||||||
#create an array for tests in a chapter
|
#create an array for tests in a chapter
|
||||||
tests = []
|
tests = []
|
||||||
sourceFiles = getAllJSFiles(chapter)
|
sourceFiles = getAllJSFiles(chapter)
|
||||||
|
|
||||||
if len(sourceFiles)!=0:
|
if len(sourceFiles)!=0:
|
||||||
excluded=0
|
excluded = 0
|
||||||
testCount = 0
|
testCount = 0
|
||||||
for test in sourceFiles:
|
for test in sourceFiles:
|
||||||
testName=test.rsplit(".", 1)[0] #12.4.6
|
testName=test.rsplit(".", 1)[0]
|
||||||
testName=testName.rsplit(os.path.sep, 1)[1]
|
testName=testName.rsplit(os.path.sep, 1)[1]
|
||||||
if EXCLUDE_LIST.count(testName)==0:
|
if EXCLUDE_LIST.count(testName)==0:
|
||||||
# dictionary for each test
|
# dictionary for each test
|
||||||
|
|
@ -194,7 +202,7 @@ for chapter in TEST_SUITE_SECTIONS:
|
||||||
scriptCodeContent=""
|
scriptCodeContent=""
|
||||||
#Rip out license headers that add unnecessary bytes to the JSON'ized test cases
|
#Rip out license headers that add unnecessary bytes to the JSON'ized test cases
|
||||||
inBeginning = True
|
inBeginning = True
|
||||||
multilineComment = False
|
IS_MULTILINE_COMMENT = False
|
||||||
|
|
||||||
for line in scriptCode:
|
for line in scriptCode:
|
||||||
if inBeginning:
|
if inBeginning:
|
||||||
|
|
@ -220,42 +228,30 @@ for chapter in TEST_SUITE_SECTIONS:
|
||||||
excluded = excluded + 1
|
excluded = excluded + 1
|
||||||
|
|
||||||
#we have completed our tests
|
#we have completed our tests
|
||||||
NUM_TESTS = str(len(sourceFiles)-excluded)
|
|
||||||
|
|
||||||
# add section node, number of tests and the tests themselves.
|
# add section node, number of tests and the tests themselves.
|
||||||
sect["numTests"] = NUM_TESTS
|
sect["numTests"] = str(len(sourceFiles)-excluded)
|
||||||
sect["tests"] = tests
|
sect["tests"] = tests
|
||||||
|
|
||||||
#create a node for the tests and add it to our testsLists
|
#create a node for the tests and add it to our testsLists
|
||||||
testsList["testsCollection"] = sect
|
testsList["testsCollection"] = sect
|
||||||
|
with open(os.path.join(TEST262_WEB_CASES_DIR, chapterName + ".json"), "w") as f:
|
||||||
testGroupPathname = TEST262_WEB_CASES_DIR + os.path.sep + chapterName + ".json"
|
|
||||||
|
|
||||||
#if you want to use jsmin to minimize the .json file, use the 2nd line. Otherwise 1st
|
|
||||||
with open(testGroupPathname, "w") as f:
|
|
||||||
json.dump(testsList, f, separators=(',',':'), sort_keys=True)
|
json.dump(testsList, f, separators=(',',':'), sort_keys=True)
|
||||||
|
|
||||||
#add the name of the chapter test to our complete list
|
#add the name of the chapter test to our complete list
|
||||||
filename = WEBSITE_CASES_PATH + chapterName + ".json"
|
SECTIONS_LIST.append(WEBSITE_CASES_PATH + chapterName + ".json")
|
||||||
testSuite.append(filename)
|
TOTAL_TEST_COUNT += int(sect["numTests"])
|
||||||
count += 1
|
|
||||||
TOTAL_TEST_COUNT += len(sourceFiles) - excluded
|
|
||||||
|
|
||||||
#we now have the list of files for each chapter
|
#we now have the list of files for each chapter
|
||||||
#create a root node for our suite
|
#create a root node for our suite
|
||||||
testSuiteRoot = {}
|
TEST_CASES_JSON = {}
|
||||||
#create suiteversion node
|
TEST_CASES_JSON["numTests"] = TOTAL_TEST_COUNT
|
||||||
#create a date node
|
TEST_CASES_JSON["version"] = ARGS.version
|
||||||
dateStr = str(datetime.datetime.now().date())
|
TEST_CASES_JSON["date"] = str(datetime.datetime.now().date())
|
||||||
#add the nodes to our suites dictionary
|
TEST_CASES_JSON["testSuite"] = SECTIONS_LIST
|
||||||
testSuiteRoot["numTests"] = TOTAL_TEST_COUNT
|
with open(os.path.join(TEST262_WEB_CASES_DIR, "testcaseslist.json"), "w") as f:
|
||||||
testSuiteRoot["version"] = ARGS.version
|
json.dump(TEST_CASES_JSON, f, separators=(',',':'), sort_keys=True)
|
||||||
testSuiteRoot["date"] = dateStr
|
|
||||||
testSuiteRoot["testSuite"] = testSuite
|
|
||||||
testcaseslistPathName = TEST262_WEB_CASES_DIR + os.path.sep + "testcaseslist.json"
|
|
||||||
|
|
||||||
with open(testcaseslistPathName, "w") as f:
|
|
||||||
json.dump(testSuiteRoot, f, separators=(',',':'), sort_keys=True)
|
|
||||||
|
|
||||||
#Deploy test harness to website as well
|
#Deploy test harness to website as well
|
||||||
print ""
|
print ""
|
||||||
|
|
@ -263,4 +259,5 @@ print "Deploying test harness files to 'TEST262_WEB_HARNESS_DIR'..."
|
||||||
for filename in [x for x in os.listdir(TEST262_HARNESS_DIR) if x.endswith(".js")]:
|
for filename in [x for x in os.listdir(TEST262_HARNESS_DIR) if x.endswith(".js")]:
|
||||||
shutil.copy(os.path.join(TEST262_HARNESS_DIR, filename),
|
shutil.copy(os.path.join(TEST262_HARNESS_DIR, filename),
|
||||||
os.path.join(TEST262_WEB_HARNESS_DIR, filename))
|
os.path.join(TEST262_WEB_HARNESS_DIR, filename))
|
||||||
|
|
||||||
print "Done."
|
print "Done."
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
{"date":"2011-03-23","numTests":10456,"testSuite":["resources/scripts/testcases/07_Lexical_Conventions.json","resources/scripts/testcases/08_Types.json","resources/scripts/testcases/09_Type_Conversion.json","resources/scripts/testcases/10_Execution_Contexts.json","resources/scripts/testcases/11.10_Binary_Bitwise_Operators.json","resources/scripts/testcases/11.11_Binary_Logical_Operators.json","resources/scripts/testcases/11.12_Conditional_Operator.json","resources/scripts/testcases/11.13_Assignment_Operators.json","resources/scripts/testcases/11.14_Comma_Operator.json","resources/scripts/testcases/11.1_Primary_Expressions.json","resources/scripts/testcases/11.2_Left_Hand_Side_Expressions.json","resources/scripts/testcases/11.3_PostfixExpressions.json","resources/scripts/testcases/11.4_Unary_Operators.json","resources/scripts/testcases/11.5_Multiplicative_Operators.json","resources/scripts/testcases/11.6_Additive_Operators.json","resources/scripts/testcases/11.7_Bitwise_Shift_Operators.json","resources/scripts/testcases/11.8_Relational_Operators.json","resources/scripts/testcases/11.9_Equality_Operators.json","resources/scripts/testcases/12_Statement.json","resources/scripts/testcases/13_Function_Definition.json","resources/scripts/testcases/14_Program.json","resources/scripts/testcases/15.10_RegExp_Objects.json","resources/scripts/testcases/15.11_Error_Objects.json","resources/scripts/testcases/15.1_The_Global_Object.json","resources/scripts/testcases/15.2_Object_Objects.json","resources/scripts/testcases/15.3_Function_Objects.json","resources/scripts/testcases/15.4_Array_Objects.json","resources/scripts/testcases/15.5_String_Objects.json","resources/scripts/testcases/15.6_Boolean_Objects.json","resources/scripts/testcases/15.7_Number_Objects.json","resources/scripts/testcases/15.8_The_Math_Object.json","resources/scripts/testcases/15.9_Date_Objects.json","resources/scripts/testcases/chapter07.json","resources/scripts/testcases/chapter10.json","resources/scripts/testcases/chapter11.json","resources/scripts/testcases/chapter12.json","resources/scripts/testcases/chapter13.json","resources/scripts/testcases/15.1.json","resources/scripts/testcases/15.10.json","resources/scripts/testcases/15.11.json","resources/scripts/testcases/15.12.json","resources/scripts/testcases/15.2.3.1.json","resources/scripts/testcases/15.2.3.10.json","resources/scripts/testcases/15.2.3.11.json","resources/scripts/testcases/15.2.3.12.json","resources/scripts/testcases/15.2.3.13.json","resources/scripts/testcases/15.2.3.14.json","resources/scripts/testcases/15.2.3.2.json","resources/scripts/testcases/15.2.3.3.json","resources/scripts/testcases/15.2.3.4.json","resources/scripts/testcases/15.2.3.5.json","resources/scripts/testcases/15.2.3.6.json","resources/scripts/testcases/15.2.3.7.json","resources/scripts/testcases/15.2.3.8.json","resources/scripts/testcases/15.2.3.9.json","resources/scripts/testcases/15.2.4.json","resources/scripts/testcases/15.3.json","resources/scripts/testcases/15.4.3.json","resources/scripts/testcases/15.4.4.10.json","resources/scripts/testcases/15.4.4.12.json","resources/scripts/testcases/15.4.4.14.json","resources/scripts/testcases/15.4.4.15.json","resources/scripts/testcases/15.4.4.16.json","resources/scripts/testcases/15.4.4.17.json","resources/scripts/testcases/15.4.4.18.json","resources/scripts/testcases/15.4.4.19.json","resources/scripts/testcases/15.4.4.20.json","resources/scripts/testcases/15.4.4.21.json","resources/scripts/testcases/15.4.4.22.json","resources/scripts/testcases/15.4.4.4.json","resources/scripts/testcases/15.4.5.json","resources/scripts/testcases/15.5.json","resources/scripts/testcases/15.7.json","resources/scripts/testcases/15.9.json"],"version":"0.6.2"}
|
{"date":"2011-03-23","numTests":10456,"testSuite":["resources/scripts/testcases/07_Lexical_Conventions.json","resources/scripts/testcases/08_Types.json","resources/scripts/testcases/09_Type_Conversion.json","resources/scripts/testcases/10_Execution_Contexts.json","resources/scripts/testcases/11.10_Binary_Bitwise_Operators.json","resources/scripts/testcases/11.11_Binary_Logical_Operators.json","resources/scripts/testcases/11.12_Conditional_Operator.json","resources/scripts/testcases/11.13_Assignment_Operators.json","resources/scripts/testcases/11.14_Comma_Operator.json","resources/scripts/testcases/11.1_Primary_Expressions.json","resources/scripts/testcases/11.2_Left_Hand_Side_Expressions.json","resources/scripts/testcases/11.3_PostfixExpressions.json","resources/scripts/testcases/11.4_Unary_Operators.json","resources/scripts/testcases/11.5_Multiplicative_Operators.json","resources/scripts/testcases/11.6_Additive_Operators.json","resources/scripts/testcases/11.7_Bitwise_Shift_Operators.json","resources/scripts/testcases/11.8_Relational_Operators.json","resources/scripts/testcases/11.9_Equality_Operators.json","resources/scripts/testcases/12_Statement.json","resources/scripts/testcases/13_Function_Definition.json","resources/scripts/testcases/14_Program.json","resources/scripts/testcases/15.10_RegExp_Objects.json","resources/scripts/testcases/15.11_Error_Objects.json","resources/scripts/testcases/15.1_The_Global_Object.json","resources/scripts/testcases/15.2_Object_Objects.json","resources/scripts/testcases/15.3_Function_Objects.json","resources/scripts/testcases/15.4_Array_Objects.json","resources/scripts/testcases/15.5_String_Objects.json","resources/scripts/testcases/15.6_Boolean_Objects.json","resources/scripts/testcases/15.7_Number_Objects.json","resources/scripts/testcases/15.8_The_Math_Object.json","resources/scripts/testcases/15.9_Date_Objects.json","resources/scripts/testcases/chapter07.json","resources/scripts/testcases/chapter10.json","resources/scripts/testcases/chapter11.json","resources/scripts/testcases/chapter12.json","resources/scripts/testcases/chapter13.json","resources/scripts/testcases/15.1.json","resources/scripts/testcases/15.10.json","resources/scripts/testcases/15.11.json","resources/scripts/testcases/15.12.json","resources/scripts/testcases/15.2.3.1.json","resources/scripts/testcases/15.2.3.10.json","resources/scripts/testcases/15.2.3.11.json","resources/scripts/testcases/15.2.3.12.json","resources/scripts/testcases/15.2.3.13.json","resources/scripts/testcases/15.2.3.14.json","resources/scripts/testcases/15.2.3.2.json","resources/scripts/testcases/15.2.3.3.json","resources/scripts/testcases/15.2.3.4.json","resources/scripts/testcases/15.2.3.5.json","resources/scripts/testcases/15.2.3.6.json","resources/scripts/testcases/15.2.3.7.json","resources/scripts/testcases/15.2.3.8.json","resources/scripts/testcases/15.2.3.9.json","resources/scripts/testcases/15.2.4.json","resources/scripts/testcases/15.3.json","resources/scripts/testcases/15.4.3.json","resources/scripts/testcases/15.4.4.10.json","resources/scripts/testcases/15.4.4.12.json","resources/scripts/testcases/15.4.4.14.json","resources/scripts/testcases/15.4.4.15.json","resources/scripts/testcases/15.4.4.16.json","resources/scripts/testcases/15.4.4.17.json","resources/scripts/testcases/15.4.4.18.json","resources/scripts/testcases/15.4.4.19.json","resources/scripts/testcases/15.4.4.20.json","resources/scripts/testcases/15.4.4.21.json","resources/scripts/testcases/15.4.4.22.json","resources/scripts/testcases/15.4.4.4.json","resources/scripts/testcases/15.4.5.json","resources/scripts/testcases/15.5.json","resources/scripts/testcases/15.7.json","resources/scripts/testcases/15.9.json"],"version":"0.6.1"}
|
||||||
Loading…
Reference in New Issue