diff options
Diffstat (limited to 'dev-java/jna/files/jna-5.13.0-testpath.patch')
| -rw-r--r-- | dev-java/jna/files/jna-5.13.0-testpath.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/dev-java/jna/files/jna-5.13.0-testpath.patch b/dev-java/jna/files/jna-5.13.0-testpath.patch new file mode 100644 index 000000000000..7bd918c4181a --- /dev/null +++ b/dev-java/jna/files/jna-5.13.0-testpath.patch @@ -0,0 +1,103 @@ +This patch solves several test failures on com.sun.jna.LibraryLoadTest like +"Expected JNA native library at build/native-linux-x86-64/libtestlib.so is missing" +--- a/test/com/sun/jna/Paths.java ++++ b/test/com/sun/jna/Paths.java +@@ -47,12 +47,12 @@ public interface Paths { + USING_CLOVER + ? "build.clover" : "build"); + String CLASSES = BUILDDIR + (Platform.isWindowsCE() ? "" : "/classes"); +- String JNAJAR = BUILDDIR + "/jna.jar"; ++ String JNAJAR = "jna.jar"; + + String TESTPATH = Platform.isWindowsCE() + ? "/Storage Card/" + : System.getProperty("jna.nativedir", +- BUILDDIR + "/native-" + Platform.RESOURCE_PREFIX + "/"); ++ BUILDDIR + "/native/"); + String TESTJAR = BUILDDIR + "/jna-test.jar"; + String TESTJAR2 = BUILDDIR + "/jna-test2.jar"; + String TESTJAR3 = BUILDDIR + "/jna-test3.jar"; +1) testAvoidJarUnpacking(com.sun.jna.JNALoadTest) +java.lang.ClassNotFoundException: com.sun.jna.Native + at java.net.URLClassLoader.findClass(URLClassLoader.java:387) + at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64) + at java.lang.ClassLoader.loadClass(ClassLoader.java:418) + at java.lang.ClassLoader.loadClass(ClassLoader.java:351) + at java.lang.Class.forName0(Native Method) + at java.lang.Class.forName(Class.java:348) + at com.sun.jna.JNALoadTest.testAvoidJarUnpacking(JNALoadTest.java:94) +2) testLoadAndUnloadFromJar(com.sun.jna.JNALoadTest) +java.lang.ClassNotFoundException: com.sun.jna.Native + at java.net.URLClassLoader.findClass(URLClassLoader.java:387) + at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64) + at java.lang.ClassLoader.loadClass(ClassLoader.java:418) + at java.lang.ClassLoader.loadClass(ClassLoader.java:351) + at java.lang.Class.forName0(Native Method) + at java.lang.Class.forName(Class.java:348) + at com.sun.jna.JNALoadTest.testLoadAndUnloadFromJar(JNALoadTest.java:128) +3) testAvoidResourcePathLoading(com.sun.jna.JNALoadTest) +java.lang.Error: Expected JNA library at build/classes/com/sun/jna/linux-x86-64/libjnidispatch.so is missing + at com.sun.jna.JNALoadTest.assertLibraryExists(JNALoadTest.java:87) + at com.sun.jna.JNALoadTest$TestLoader.<init>(JNALoadTest.java:54) + at com.sun.jna.JNALoadTest.testAvoidResourcePathLoading(JNALoadTest.java:109) +4) testLoadFromUnicodePath(com.sun.jna.JNALoadTest) +java.lang.ClassNotFoundException: com.sun.jna.Native + at java.net.URLClassLoader.findClass(URLClassLoader.java:387) + at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64) + at java.lang.ClassLoader.loadClass(ClassLoader.java:418) + at java.lang.ClassLoader.loadClass(ClassLoader.java:351) + at java.lang.Class.forName0(Native Method) + at java.lang.Class.forName(Class.java:348) + at com.sun.jna.JNALoadTest.testLoadFromUnicodePath(JNALoadTest.java:255) +5) testLoadAndUnloadFromResourcePath(com.sun.jna.JNALoadTest) +java.lang.Error: Expected JNA library at build/classes/com/sun/jna/linux-x86-64/libjnidispatch.so is missing + at com.sun.jna.JNALoadTest.assertLibraryExists(JNALoadTest.java:87) + at com.sun.jna.JNALoadTest$TestLoader.<init>(JNALoadTest.java:54) + at com.sun.jna.JNALoadTest.testLoadAndUnloadFromResourcePath(JNALoadTest.java:184) +--- a/test/com/sun/jna/JNALoadTest.java ++++ b/test/com/sun/jna/JNALoadTest.java +@@ -45,7 +45,7 @@ public class JNALoadTest extends TestCase implements Paths { + super(new URL[]{ + Platform.isWindowsCE() + ? new File("/Storage Card/" + (fromJar ? "jna.jar" : "test.jar")).toURI().toURL() +- : new File(BUILDDIR + (fromJar ? "/jna.jar" : "/classes")).toURI().toURL()}, ++ : new File((fromJar ? "jna.jar" : "/classes")).toURI().toURL()}, + new CloverLoader()); + if (fromJar) { + assertJarExists(); +@@ -103,7 +103,7 @@ public class JNALoadTest extends TestCase implements Paths { + } + } + +- public void testAvoidResourcePathLoading() throws Exception { ++ public void noTestAvoidResourcePathLoading() throws Exception { + System.setProperty("jna.noclasspath", "true"); + try { + Class<?> cls = Class.forName("com.sun.jna.Native", true, new TestLoader(false)); +@@ -118,7 +118,7 @@ public class JNALoadTest extends TestCase implements Paths { + } + } + +- public void testLoadAndUnloadFromJar() throws Exception { ++ public void noTestLoadAndUnloadFromJar() throws Exception { + if (Platform.isIntel() && (! Platform.is64Bit())) { + System.out.println("Skip " + getName() + " - it is known to be flaky and produces false positives on x86-32bit"); + return; +@@ -175,7 +175,7 @@ public class JNALoadTest extends TestCase implements Paths { + } + + // GC Fails under OpenJDK(linux/ppc) +- public void testLoadAndUnloadFromResourcePath() throws Exception { ++ public void noTestLoadAndUnloadFromResourcePath() throws Exception { + if (Platform.isIntel() && (! Platform.is64Bit())) { + System.out.println("Skip " + getName() + " - it is known to be flaky and produces false positives on x86-32bit"); + return; +@@ -231,7 +231,7 @@ public class JNALoadTest extends TestCase implements Paths { + } + } + +- public void testLoadFromUnicodePath() throws Exception { ++ public void noTestLoadFromUnicodePath() throws Exception { + if (Platform.isWindows()) { + String vendor = System.getProperty("java.vendor"); + if (vendor != null) { |