forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #910 from parrt/mv-python2-to-new-test-gen 

got all but 2 tests passing for py2!
This commit is contained in:
Terence Parr 2015-06-16 14:53:48 -07:00
parent 7d36891c82 3ddb25919d
commit 21740a48b6
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bild.py
View File

@ -66,7 +66,7 @@ TARGETS = OrderedDict([
RUNTIME_TEST_TEMPLATES = { RUNTIME_TEST_TEMPLATES = {
"Java" : uniformpath(JAVA_TARGET)+"/tool/test/org/antlr/v4/test/runtime/java/Java.test.stg", "Java" : uniformpath(JAVA_TARGET)+"/tool/test/org/antlr/v4/test/runtime/java/Java.test.stg",
"CSharp" : uniformpath(CSHARP_TARGET)+"/tool/test/org/antlr/v4/test/runtime/csharp/CSharp.test.stg", "CSharp" : uniformpath(CSHARP_TARGET)+"/tool/test/org/antlr/v4/test/runtime/csharp/CSharp.test.stg",
# "Python2" : uniformpath(PYTHON2_TARGET)+"/tool/test/org/antlr/v4/test/rt/py2/Python2.test.stg", "Python2" : uniformpath(PYTHON2_TARGET)+"/tool/test/org/antlr/v4/test/runtime/python2/Python2.test.stg",
"Python3" : uniformpath(PYTHON3_TARGET)+"/tool/test/org/antlr/v4/test/runtime/python3/Python3.test.stg", "Python3" : uniformpath(PYTHON3_TARGET)+"/tool/test/org/antlr/v4/test/runtime/python3/Python3.test.stg",
# "NodeJS" : uniformpath(JAVASCRIPT_TARGET)+"/tool/test/org/antlr/v4/test/rt/js/node/NodeJS.test.stg", # "NodeJS" : uniformpath(JAVASCRIPT_TARGET)+"/tool/test/org/antlr/v4/test/rt/js/node/NodeJS.test.stg",
# "Safari" : uniformpath(JAVASCRIPT_TARGET)+"/tool/test/org/antlr/v4/test/rt/js/safari/Safari.test.stg", # "Safari" : uniformpath(JAVASCRIPT_TARGET)+"/tool/test/org/antlr/v4/test/rt/js/safari/Safari.test.stg",
@ -90,21 +90,24 @@ def compile():
""" """
require(parsers) require(parsers)
require(regen_tests) require(regen_tests)
junit_jar, hamcrest_jar = load_junitjars()
cp = uniformpath("out") + os.pathsep + \ cp = uniformpath("out") + os.pathsep + \
os.path.join(JARCACHE, "antlr-3.5.2-complete.jar") + os.pathsep + \ os.path.join(JARCACHE, "antlr-3.5.2-complete.jar") + os.pathsep + \
"runtime/Java/lib/org.abego.treelayout.core.jar" + os.pathsep "runtime/Java/lib/org.abego.treelayout.core.jar" + os.pathsep + \
srcpath = ["gen3", "gen4", "runtime/Java/src", "tool/src"] os.pathsep + uniformpath("out") + \
os.pathsep + junit_jar + \
os.pathsep + hamcrest_jar
srcpath = ["gen3", "gen4", "runtime/Java/src", "tool/src", "tool/test"]
args = ["-Xlint", "-Xlint:-serial", "-g", "-sourcepath", string.join(srcpath, os.pathsep)] args = ["-Xlint", "-Xlint:-serial", "-g", "-sourcepath", string.join(srcpath, os.pathsep)]
for sp in srcpath: for sp in srcpath:
javac(sp, "out", version="1.6", cp=cp, args=args) javac(sp, "out", version="1.6", cp=cp, args=args, skip=['org/antlr/v4/test/rt'])
junit_jar, hamcrest_jar = load_junitjars()
cp += os.pathsep + uniformpath("out") \
+ os.pathsep + junit_jar \
+ os.pathsep + hamcrest_jar
# pull in targets' code gen # pull in targets' code gen
for t in TARGETS: for t in TARGETS:
javac(TARGETS[t] + "/tool/src", "out", version="1.6", cp=cp, args=args) javac(TARGETS[t] + "/tool/src", "out", version="1.6", cp=cp, args=args)
# pull in generated runtime tests and runtime test support code # pull in generated runtime tests and runtime test support code
# Special case: python2 needs code from python3
javac(uniformpath(TARGETS['Python3'])+"/tool/test/org/antlr/v4/test/runtime/python2/BasePythonTest.java",
"out", version="1.6", cp=cp, args=args)
for t in RUNTIME_TEST_TEMPLATES: for t in RUNTIME_TEST_TEMPLATES:
javac(TARGETS[t] + "/tool/test", "out", version="1.6", cp=cp, args=args, skip=['org/antlr/v4/test/rt']) javac(TARGETS[t] + "/tool/test", "out", version="1.6", cp=cp, args=args, skip=['org/antlr/v4/test/rt'])
javac('gen/test/'+t, "out", version="1.6", cp=cp, args=args) javac('gen/test/'+t, "out", version="1.6", cp=cp, args=args)
@ -335,10 +338,11 @@ def test(target, juprops, args):
# don't test generator # don't test generator
skip = [ "TestPerformance.java", "TestGenerator.java" ] skip = [ "TestPerformance.java", "TestGenerator.java" ]
elif target=='Python2': elif target=='Python2':
# need BaseTest located in python3 target # need BasePythonTest located in python3 target
base = uniformpath(TARGETS['Python3'] + "/tool/test") # base = uniformpath(TARGETS['Python3'] + "/tool/test")
skip = [ "/org/antlr/v4/test/runtime/python3/" ] # skip = [ "/org/antlr/v4/test/runtime/python3/" ]
javac(base, "out/test/"+target, version="1.6", cp=thisjarwithjunit, args=args, skip=skip) # javac(base+"/tool/test/org/antlr/v4/test/runtime/python2/BasePythonTest.java",
# "out/test/"+target, version="1.6", cp=thisjarwithjunit, args=args, skip=skip)
skip = [] skip = []
elif target=='JavaScript': elif target=='JavaScript':
# don't test browsers automatically, this is overkill and unreliable # don't test browsers automatically, this is overkill and unreliable

5
tool/tool.iml
View File

@ -20,6 +20,7 @@
<sourceFolder url="file://$MODULE_DIR$/../gen/test/CSharp" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../gen/test/CSharp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../gen/test/Java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../gen/test/Java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../gen/test/Python3" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../gen/test/Python3" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../gen/test/Python2" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/../.idea" /> <excludeFolder url="file://$MODULE_DIR$/../.idea" />
<excludeFolder url="file://$MODULE_DIR$/../antlr4-maven-plugin" /> <excludeFolder url="file://$MODULE_DIR$/../antlr4-maven-plugin" />
<excludeFolder url="file://$MODULE_DIR$/../runtime" /> <excludeFolder url="file://$MODULE_DIR$/../runtime" />
@ -33,6 +34,10 @@
<content url="file://$MODULE_DIR$/../../antlr4-csharp/tool/test"> <content url="file://$MODULE_DIR$/../../antlr4-csharp/tool/test">
<sourceFolder url="file://$MODULE_DIR$/../../antlr4-csharp/tool/test" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../antlr4-csharp/tool/test" isTestSource="false" />
</content> </content>
<content url="file://$MODULE_DIR$/../../antlr4-python2">
<sourceFolder url="file://$MODULE_DIR$/../../antlr4-python2/tool/test" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../antlr4-python2/tool/src" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../antlr4-python3"> <content url="file://$MODULE_DIR$/../../antlr4-python3">
<sourceFolder url="file://$MODULE_DIR$/../../antlr4-python3/tool/test" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../antlr4-python3/tool/test" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../antlr4-python3/tool/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../../antlr4-python3/tool/src" isTestSource="false" />