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

take out flag for cmake as it doesn't work on linux. turn off C++ tests on mac

This commit is contained in:
parrt 2016-11-20 20:28:12 -08:00
parent 8e33fe49f5
commit 27a59988a2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis/run-tests-linux.sh
View File

@ -7,3 +7,4 @@ mvn -Dtest=python3.* test
mvn -Dtest=node.* test mvn -Dtest=node.* test
mvn -Dtest=go.* test mvn -Dtest=go.* test
mvn -Dtest=cpp.* test mvn -Dtest=cpp.* test
#mvn -Dtest=swift.* test

2
.travis/run-tests-macos.sh
View File

@ -6,5 +6,5 @@ mvn -Dtest=python2.* test
mvn -Dtest=python3.* test mvn -Dtest=python3.* test
mvn -Dtest=node.* test mvn -Dtest=node.* test
mvn -Dtest=go.* test mvn -Dtest=go.* test
mvn -Dtest=cpp.* test #mvn -Dtest=cpp.* test
mvn -Dtest=swift.* test mvn -Dtest=swift.* test

2
runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
View File

@ -622,7 +622,7 @@ public class BaseCppTest implements RuntimeTestSupport {
System.out.println("Building ANTLR4 C++ runtime (if necessary) at "+ runtimePath); System.out.println("Building ANTLR4 C++ runtime (if necessary) at "+ runtimePath);
try { try {
String command[] = { "cmake", ".", "-DCMAKE_CXX_COMPILER=clang++", "-DCMAKE_BUILD_TYPE=release" }; String command[] = { "cmake", ".", /*"-DCMAKE_CXX_COMPILER=clang++",*/ "-DCMAKE_BUILD_TYPE=release" };
if (runCommand(command, runtimePath, "antlr runtime cmake") == null) if (runCommand(command, runtimePath, "antlr runtime cmake") == null)
return false; return false;
} }