diff --git a/src/bindings/java/native/linux/pom.xml b/src/bindings/java/native/linux/pom.xml index 50051ae287eae68639a00b2c581cda421ff2b828..8013cdec09c7adb5e93fcbb8c97fe6090e58fee1 100644 --- a/src/bindings/java/native/linux/pom.xml +++ b/src/bindings/java/native/linux/pom.xml @@ -76,13 +76,11 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>-Djava.library.path=${project.build.directory}</argLine> <forkMode>once</forkMode> <environmentVariables> <LD_LIBRARY_PATH>${project.build.directory}:../../../../</LD_LIBRARY_PATH> </environmentVariables> - <systemPropertyVariables> - <java.library.path>${project.build.directory}</java.library.path> - </systemPropertyVariables> </configuration> </plugin> </plugins> diff --git a/src/bindings/java/native/src/main/native/com_upstandinghackers_hammer_ParsedToken.c b/src/bindings/java/native/src/main/native/com_upstandinghackers_hammer_ParsedToken.c index f69856c1e8739e210f9f9f6f0d9746fc6ae0524e..90a1795c887e48e88dff07b50cea29b93b8a900f 100644 --- a/src/bindings/java/native/src/main/native/com_upstandinghackers_hammer_ParsedToken.c +++ b/src/bindings/java/native/src/main/native/com_upstandinghackers_hammer_ParsedToken.c @@ -91,14 +91,6 @@ static jobject make_bignum(JNIEnv *env, uint64_t num, int signedp) { jbyteArray byteArray = (*env)->NewByteArray(env, 9); (*env)->SetByteArrayRegion(env, byteArray, (jsize)0, (jsize)9, bytebuf); - printf("Formatted %s 0x%016lx as [", signedp ? "signed" : "unsigned", num); - for (int i = 0; i < 9; i++) - printf("%02hhx%s", bytebuf[i], (i == 8) ? "]\n":"."); - /* - int buflen = 0; - jchar* numbuf = format_number(num, 0, signedp, *buflen, 0); - jstring numstr = env->NewString(env, numbuf, buflen); - */ jclass BigNum; FIND_CLASS(BigNum, env, "java/math/BigInteger"); jmethodID bignum_ctor = (*env)->GetMethodID(env, BigNum, "<init>", "([B)V"); diff --git a/src/bindings/java/native/src/test/java/TestSupport.java b/src/bindings/java/native/src/test/java/TestSupport.java index d3b1a037b8a1b9ec42e5848a2727e9f81d91d700..7f08f94dd942fc4f06c7d9801843bc2ac6440687 100644 --- a/src/bindings/java/native/src/test/java/TestSupport.java +++ b/src/bindings/java/native/src/test/java/TestSupport.java @@ -6,26 +6,19 @@ import org.testng.Assert; public class TestSupport { protected boolean deepEqual(ParsedToken p, Object known) { - //if (known != null || p == null) - // throw new RuntimeException("Actually got here!"); if (p == null) { return known == null; } - System.err.println("Saw token of type: " + p.getTokenType()); - System.err.println("Arg of type: " + (known == null ? "null" : known.getClass().toString())); switch (p.getTokenType()) { case BYTES: byte[] tmp_byte_buffer = p.getBytesValue(); String knowns = (String)known; for (int i = 0; i < tmp_byte_buffer.length; i++) { - System.err.println("Comparing char " + i); if (tmp_byte_buffer[i] != (byte)knowns.charAt(i)) { - System.err.println("Compare failed at char " + i + ": " + (byte)knowns.charAt(i) + " != " + tmp_byte_buffer[i]); return false; } } - System.err.println("Compare succeeded"); return true; case SINT: return p.getSIntValue().equals(known); @@ -42,7 +35,6 @@ public class TestSupport { case NONE: return known == null; default: - System.err.println("Unkown token type " + p.getTokenType()); return false; } }