From: Mathias Preiner Date: Mon, 17 Sep 2018 23:32:18 +0000 (-0700) Subject: cmake: Require JUnit version 4. X-Git-Tag: cvc5-1.0.0~4539 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a96ecb64741a78b6e138c75fcd7155058658849;p=cvc5.git cmake: Require JUnit version 4. --- diff --git a/test/java/BitVectors.java b/test/java/BitVectors.java index 22dccfefc..f24861322 100644 --- a/test/java/BitVectors.java +++ b/test/java/BitVectors.java @@ -51,7 +51,7 @@ public class BitVectors { // // Two more efficient yet equivalent methods are: // - //(1) x = a ⊕ b ⊕ x; + //(1) x = a xor b xor x; // //(2) x = a + b - x; // diff --git a/test/java/CMakeLists.txt b/test/java/CMakeLists.txt index 0139c5672..27042559a 100644 --- a/test/java/CMakeLists.txt +++ b/test/java/CMakeLists.txt @@ -1,5 +1,5 @@ find_package(Java REQUIRED) -find_package(JUnit REQUIRED) +find_package(JUnit 4.0 REQUIRED) include(UseJava) set(java_test_src_files @@ -28,7 +28,7 @@ foreach(src_file ${java_test_src_files}) add_test( NAME ${name} COMMAND - java + ${Java_JAVA_EXECUTABLE} -Djava.library.path=${CMAKE_BINARY_DIR}/src/bindings/java/ -cp ${classpath} org.junit.runner.JUnitCore