From dec5d26a3d14920628636e01438040520010532b Mon Sep 17 00:00:00 2001 From: Terence Parr Date: Fri, 26 Jun 2015 13:33:32 -0700 Subject: [PATCH] tweak pom so it compiles in `compile` phase and `install` phase but doesn't run tests correctly. --- antlr4-testgen-maven-plugin/pom.xml | 4 +- pom.xml | 26 +++---- runtime-testsuite/pom.xml | 102 ++++++++++------------------ tool-testsuite/pom.xml | 85 +++++++++++++++++++++++ 4 files changed, 131 insertions(+), 86 deletions(-) create mode 100644 tool-testsuite/pom.xml diff --git a/antlr4-testgen-maven-plugin/pom.xml b/antlr4-testgen-maven-plugin/pom.xml index 993f3bbb4..2f484170e 100644 --- a/antlr4-testgen-maven-plugin/pom.xml +++ b/antlr4-testgen-maven-plugin/pom.xml @@ -107,7 +107,7 @@ org.antlr - runtime-testsuite + antlr4-runtime-testsuite ${project.version} @@ -136,7 +136,7 @@ - + install diff --git a/pom.xml b/pom.xml index fd8f5c13d..a44d5df8b 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,10 @@ runtime/Java tool + runtime-testsuite antlr4-maven-plugin antlr4-testgen-maven-plugin + tool-testsuite @@ -103,28 +105,16 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - - + + + rts - runtime-testsuite + antlr4-runtime-testsuite - + - + diff --git a/runtime-testsuite/pom.xml b/runtime-testsuite/pom.xml index 3ff77f307..e08e63094 100644 --- a/runtime-testsuite/pom.xml +++ b/runtime-testsuite/pom.xml @@ -7,7 +7,7 @@ antlr4-master 4.5.1-SNAPSHOT - runtime-testsuite + antlr4-runtime-testsuite ANTLR 4 Runtime Test Generator A collection of tests for ANTLR 4 Runtime libraries. @@ -44,6 +44,41 @@ src + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + **/safari/*.java + **/chrome/*.java + **/firefox/*.java + **/explorer/*.java + + + + + default-testCompile + test-compile + + + **/safari/*.java + **/chrome/*.java + **/firefox/*.java + **/explorer/*.java + + + + testCompile + + + + + + com.googlecode.maven-download-plugin @@ -52,63 +87,6 @@ true - - - python2 - generate-test-resources - - wget - - - https://raw.githubusercontent.com/antlr/antlr4-python2/master/tool/test/org/antlr/v4/test/runtime/python2/BasePython2Test.java - generated-sources/org/antlr/v4/test/runtime/python2/BasePython2Test.java - - - - python3 - generate-test-resources - - wget - - - https://raw.githubusercontent.com/antlr/antlr4-python3/master/tool/test/org/antlr/v4/test/runtime/python3/BasePython3Test.java - generated-sources/org/antlr/v4/test/runtime/python3/BasePython3Test.java - - - - python - generate-test-resources - - wget - - - https://raw.githubusercontent.com/antlr/antlr4-python3/master/tool/test/org/antlr/v4/test/runtime/python/BasePythonTest.java - generated-sources/org/antlr/v4/test/runtime/python/BasePythonTest.java - - - - javascript - generate-test-resources - - wget - - - https://raw.githubusercontent.com/antlr/antlr4-javascript/master/tool/test/org/antlr/v4/test/runtime/javascript/node/BaseTest.java - generated-sources/org/antlr/v4/test/runtime/javascript/node/BaseTest.java - - - - csharp - generate-test-resources - - wget - - - https://raw.githubusercontent.com/antlr/antlr4-csharp/master/tool/test/org/antlr/v4/test/runtime/csharp/BaseTest.java - generated-sources/org/antlr/v4/test/runtime/csharp/BaseTest.java - - - org.codehaus.mojo @@ -132,14 +110,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - ../../antlr4-python2/src - ../../antlr4-python3/src - ../../antlr4-csharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.mono.csproj - ../../antlr4-javascript/src - - diff --git a/tool-testsuite/pom.xml b/tool-testsuite/pom.xml new file mode 100644 index 000000000..35d173329 --- /dev/null +++ b/tool-testsuite/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + org.antlr + antlr4-master + 4.5.1-SNAPSHOT + + antlr4-tool-testsuite + ANTLR 4 Tool Tests + A collection of tests for ANTLR 4 Runtime libraries. + + + 3.0 + + + 2009 + + + + org.antlr + ST4 + 4.0.8 + + + org.antlr + antlr4-runtime + ${project.version} + + + org.antlr + antlr4-runtime-testsuite + ${project.version} + + + org.antlr + antlr4 + ${project.version} + + + org.antlr + antlr4 + ${project.version} + test-jar + + + junit + junit + 4.11 + test + + + + + src + + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.2.1 + + true + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + org.apache.maven.plugins + maven-surefire-plugin + + + ../../antlr4-python2/src + ../../antlr4-python3/src + ../../antlr4-csharp/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.mono.csproj + ../../antlr4-javascript/src + + + + + +