summaryrefslogtreecommitdiff
path: root/test/java
diff options
context:
space:
mode:
authorMathias Preiner <mathias.preiner@gmail.com>2018-09-17 16:32:18 -0700
committerMathias Preiner <mathias.preiner@gmail.com>2018-09-22 16:30:59 -0700
commit4a96ecb64741a78b6e138c75fcd7155058658849 (patch)
treeadeb55e4dbc98d270de9b4fdf0ccbf7f928a6e56 /test/java
parent4e4dc5b946d11a676a45c3bd7ff058174ab8d748 (diff)
cmake: Require JUnit version 4.
Diffstat (limited to 'test/java')
-rw-r--r--test/java/BitVectors.java2
-rw-r--r--test/java/CMakeLists.txt4
2 files changed, 3 insertions, 3 deletions
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
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback