rpms/abrt-java-connector
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop more patches for Java 11 compat

Browse source
This commit is contained in:
Ernestas Kulik 2020-06-17 09:49:21 +02:00
commit a09adfda83
9 changed files with 1902 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Adapt-to-different-exception-messages-in-Java-11.patch → 0001-Adapt-to-different-exception-messages-in-Java-11.patch
View file

@ -1,7 +1,7 @@
From 9629e6cc1aa0ca2d04a387efb432d0daee0e4ec4 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 07:03:43 +0200
Subject: [PATCH] Adapt to different exception messages in Java 11
Subject: [PATCH 1/8] Adapt to different exception messages in Java 11
Out-of-bounds exceptions now additionally spit out the length of the
container.

1411
0002-Drop-unused-test-output-files.patch Normal file
View file

File diff suppressed because it is too large Load diff

58
0003-Add-indices-to-out-of-bounds-exception-output-files.patch Normal file
View file

@ -0,0 +1,58 @@
From e5ccad0135e7c07aeb329e76101e2b666202a7d7 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 07:23:52 +0200
Subject: [PATCH 3/8] Add indices to out-of-bounds exception output files
Some things missed in 9629e6cc1aa0ca2d04a387efb432d0daee0e4ec4.
---
test/outputs/backtrace_not_reportable_1remote_class.log.in | 2 +-
test/outputs/backtrace_not_reportable_3remote_classes.log.in | 2 +-
test/outputs/run_remote_thread.log.in | 2 +-
test/outputs/run_threads.log.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/outputs/backtrace_not_reportable_1remote_class.log.in b/test/outputs/backtrace_not_reportable_1remote_class.log.in
index 5555da5..4f5b3a9 100644
--- a/test/outputs/backtrace_not_reportable_1remote_class.log.in
+++ b/test/outputs/backtrace_not_reportable_1remote_class.log.in
@@ -1,4 +1,4 @@
-Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: 42
+Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
>---at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
>---at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
>---at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
diff --git a/test/outputs/backtrace_not_reportable_3remote_classes.log.in b/test/outputs/backtrace_not_reportable_3remote_classes.log.in
index 77fb989..4a32656 100644
--- a/test/outputs/backtrace_not_reportable_3remote_classes.log.in
+++ b/test/outputs/backtrace_not_reportable_3remote_classes.log.in
@@ -1,4 +1,4 @@
-Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: 42
+Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
>---at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
>---at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:http://localhost:321/JarTest.jar!/SimpleTest.class]
>---at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:http://localhost:4321/JarTest.jar!/SimpleTest.class]
diff --git a/test/outputs/run_remote_thread.log.in b/test/outputs/run_remote_thread.log.in
index ecca10e..a871ad0 100644
--- a/test/outputs/run_remote_thread.log.in
+++ b/test/outputs/run_remote_thread.log.in
@@ -1,5 +1,5 @@
Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
-Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: 42
+Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
diff --git a/test/outputs/run_threads.log.in b/test/outputs/run_threads.log.in
index b9089b7..04c5b35 100644
--- a/test/outputs/run_threads.log.in
+++ b/test/outputs/run_threads.log.in
@@ -1,5 +1,5 @@
Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
-Exception in thread "Thread-0" java.lang.ArrayIndexOutOfBoundsException: 42
+Exception in thread "Thread-0" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
--
2.26.2

33
0004-test-bad_class-Adapt-output-to-Java-11.patch Normal file
View file

@ -0,0 +1,33 @@
From 307e0d19d4c99dae16491fd288e915b0bb6522ac Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 07:30:29 +0200
Subject: [PATCH 4/8] test: bad_class: Adapt output to Java 11
---
test/outputs/run_bad_class.log.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/test/outputs/run_bad_class.log.in b/test/outputs/run_bad_class.log.in
index 2b58474..bdff081 100644
--- a/test/outputs/run_bad_class.log.in
+++ b/test/outputs/run_bad_class.log.in
@@ -1,10 +1,9 @@
-Uncaught exception java.lang.ClassNotFoundException in method java.lang.ClassLoader.loadClass()
+Uncaught exception java.lang.ClassNotFoundException in method jdk.internal.loader.BuiltinClassLoader.loadClass()
Exception in thread "main" java.lang.ClassNotFoundException: foobar
- at java.net.URLClassLoader.findClass(URLClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URLClassLoader.class]
- at java.lang.ClassLoader.loadClass(ClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/ClassLoader.class]
- at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/misc/Launcher$AppClassLoader.class]
- at java.lang.ClassLoader.loadClass(ClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/ClassLoader.class]
- at java.lang.Class.forName0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Class.class]
- at java.lang.Class.forName(Class.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Class.class]
+ at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:LINENO) [jrt:/java.base/jdk/internal/loader/BuiltinClassLoader.class]
+ at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:LINENO) [jrt:/java.base/jdk/internal/loader/ClassLoaders$AppClassLoader.class]
+ at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:LINENO) [jrt:/java.base/java/lang/ClassLoader.class]
+ at java.base/java.lang.Class.forName0(Native Method) [jrt:/java.base/java/lang/Class.class]
+ at java.base/java.lang.Class.forName(Class.java:LINENO) [jrt:/java.base/java/lang/Class.class]
at BadClassTest.main(BadClassTest.java:13) [file:@CMAKE_BINARY_DIR@/test/BadClassTest.class]
executable: @CMAKE_BINARY_DIR@/test/BadClassTest.class
--
2.26.2

228
0005-Adapt-more-test-ouput-to-Java-11.patch Normal file
View file

@ -0,0 +1,228 @@
From 4c60444a35303a243cd3b35a9d72e69afb54d809 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 08:32:39 +0200
Subject: [PATCH 5/8] Adapt more test ouput to Java 11
Paths to runtime classes are no longer printed out, so we can simplify
the driver magic.
---
test/outputs/run_test.log.in | 108 ++++++++++++++++++-----------------
test/testdriver | 7 +--
2 files changed, 56 insertions(+), 59 deletions(-)
diff --git a/test/outputs/run_test.log.in b/test/outputs/run_test.log.in
index aa2b110..ae4a894 100644
--- a/test/outputs/run_test.log.in
+++ b/test/outputs/run_test.log.in
@@ -1,98 +1,99 @@
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
- at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
- at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
- at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.open0(Native Method) [jrt:/java.base/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.open(FileInputStream.java:LINENO) [jrt:/java.base/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jrt:/java.base/java/io/FileInputStream.class]
at Test.readWrongFile(Test.java:89) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:461) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
- at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
- at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
- at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.open0(Native Method) [jrt:/java.base/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.open(FileInputStream.java:LINENO) [jrt:/java.base/java/io/FileInputStream.class]
+ at java.base/java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jrt:/java.base/java/io/FileInputStream.class]
at Test.readUnreadableFile(Test.java:111) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:462) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
- at java.io.FileOutputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
- at java.io.FileOutputStream.open(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
- at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
- at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
+ at java.base/java.io.FileOutputStream.open0(Native Method) [jrt:/java.base/java/io/FileOutputStream.class]
+ at java.base/java.io.FileOutputStream.open(FileOutputStream.java:LINENO) [jrt:/java.base/java/io/FileOutputStream.class]
+ at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jrt:/java.base/java/io/FileOutputStream.class]
+ at java.base/java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jrt:/java.base/java/io/FileOutputStream.class]
at Test.writeToUnwritableFile(Test.java:134) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:463) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.net.UnknownHostException in method java.net.Inet4AddressImpl.lookupAllHostAddr()
Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
- at java.net.Inet4AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet4AddressImpl.class]
- at java.net.InetAddress$2.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$2.class]
- at java.net.InetAddress.getAddressesFromNameService(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
- at java.net.InetAddress.getAllByName0(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
- at java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
- at java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
- at java.net.InetAddress.getByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
- at java.net.InetSocketAddress.<init>(InetSocketAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetSocketAddress.class]
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
+ at java.base/java.net.Inet4AddressImpl.lookupAllHostAddr(Native Method) [jrt:/java.base/java/net/Inet4AddressImpl.class]
+ at java.base/java.net.InetAddress$PlatformNameService.lookupAllHostAddr(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress$PlatformNameService.class]
+ at java.base/java.net.InetAddress.getAddressesFromNameService(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress.class]
+ at java.base/java.net.InetAddress$NameServiceAddresses.get(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress$NameServiceAddresses.class]
+ at java.base/java.net.InetAddress.getAllByName0(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress.class]
+ at java.base/java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress.class]
+ at java.base/java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress.class]
+ at java.base/java.net.InetAddress.getByName(InetAddress.java:LINENO) [jrt:/java.base/java/net/InetAddress.class]
+ at java.base/java.net.InetSocketAddress.<init>(InetSocketAddress.java:LINENO) [jrt:/java.base/java/net/InetSocketAddress.class]
+ at java.base/java.net.Socket.<init>(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
at Test.readFromUnknownHost(Test.java:157) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:473) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.net.UnknownHostException in method java.net.AbstractPlainSocketImpl.connect()
Exception in thread "main" java.net.UnknownHostException: xyzzy
- at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/AbstractPlainSocketImpl.class]
- at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/SocksSocketImpl.class]
- at java.net.Socket.connect(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.connect(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
+ at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:LINENO) [jrt:/java.base/java/net/AbstractPlainSocketImpl.class]
+ at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:LINENO) [jrt:/java.base/java/net/SocksSocketImpl.class]
+ at java.base/java.net.Socket.connect(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.connect(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.<init>(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.<init>(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
at Test.readFromUnknownHost(Test.java:157) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:473) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.net.ConnectException in method java.net.PlainSocketImpl.socketConnect()
Exception in thread "main" java.net.ConnectException: Connection refused (Connection refused)
- at java.net.PlainSocketImpl.socketConnect(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/PlainSocketImpl.class]
- at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/AbstractPlainSocketImpl.class]
- at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/AbstractPlainSocketImpl.class]
- at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/AbstractPlainSocketImpl.class]
- at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/SocksSocketImpl.class]
- at java.net.Socket.connect(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.connect(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
+ at java.base/java.net.PlainSocketImpl.socketConnect(Native Method) [jrt:/java.base/java/net/PlainSocketImpl.class]
+ at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:LINENO) [jrt:/java.base/java/net/AbstractPlainSocketImpl.class]
+ at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:LINENO) [jrt:/java.base/java/net/AbstractPlainSocketImpl.class]
+ at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:LINENO) [jrt:/java.base/java/net/AbstractPlainSocketImpl.class]
+ at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:LINENO) [jrt:/java.base/java/net/SocksSocketImpl.class]
+ at java.base/java.net.Socket.connect(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.connect(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.<init>(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
+ at java.base/java.net.Socket.<init>(Socket.java:LINENO) [jrt:/java.base/java/net/Socket.class]
at Test.readFromSocket(Test.java:177) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:474) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.lang.NumberFormatException in method java.lang.Long.parseLong()
Exception in thread "main" java.lang.NumberFormatException: null
- at java.lang.Long.parseLong(Long.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Long.class]
- at java.lang.Long.parseLong(Long.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Long.class]
- at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
- at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
- at java.net.URL.openStream(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
+ at java.base/java.lang.Long.parseLong(Long.java:LINENO) [jrt:/java.base/java/lang/Long.class]
+ at java.base/java.lang.Long.parseLong(Long.java:LINENO) [jrt:/java.base/java/lang/Long.class]
+ at java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jrt:/java.base/sun/net/www/protocol/http/HttpURLConnection.class]
+ at java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jrt:/java.base/sun/net/www/protocol/http/HttpURLConnection.class]
+ at java.base/java.net.URL.openStream(URL.java:LINENO) [jrt:/java.base/java/net/URL.class]
at Test.readFromURL(Test.java:238) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:475) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream0()
Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
- at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
- at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
- at java.net.URL.openStream(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
+ at java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jrt:/java.base/sun/net/www/protocol/http/HttpURLConnection.class]
+ at java.base/sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jrt:/java.base/sun/net/www/protocol/http/HttpURLConnection.class]
+ at java.base/java.net.URL.openStream(URL.java:LINENO) [jrt:/java.base/java/net/URL.class]
at Test.readFromURL(Test.java:238) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:475) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.net.MalformedURLException in method java.net.URL.<init>()
Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&malformed URL@#$%^&*()
- at java.net.URL.<init>(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
- at java.net.URL.<init>(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
- at java.net.URL.<init>(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
+ at java.base/java.net.URL.<init>(URL.java:LINENO) [jrt:/java.base/java/net/URL.class]
+ at java.base/java.net.URL.<init>(URL.java:LINENO) [jrt:/java.base/java/net/URL.class]
+ at java.base/java.net.URL.<init>(URL.java:LINENO) [jrt:/java.base/java/net/URL.class]
at Test.malformedURL(Test.java:194) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.networkRelatedIssues(Test.java:476) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
@@ -104,9 +105,10 @@ Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: Index 42 ou
at Test.throwAndCatchAllExceptions(Test.java:486) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
-Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.charAt()
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.StringLatin1.charAt()
Exception in thread "main" java.lang.StringIndexOutOfBoundsException: String index out of range: -1
- at java.lang.String.charAt(String.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/String.class]
+ at java.base/java.lang.StringLatin1.charAt(StringLatin1.java:LINENO) [jrt:/java.base/java/lang/StringLatin1.class]
+ at java.base/java.lang.String.charAt(String.java:LINENO) [jrt:/java.base/java/lang/String.class]
at Test.throwStringIndexOutOfBoundsException(Test.java:278) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.catchStringIndexOutOfBoundsException(Test.java:362) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.throwAndCatchAllExceptions(Test.java:487) [file:@CMAKE_BINARY_DIR@/test/Test.class]
@@ -120,7 +122,7 @@ Exception in thread "main" java.lang.NullPointerException
at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.lang.ClassCastException in method Test.throwClassCastException()
-Exception in thread "main" java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.String
+Exception in thread "main" java.lang.ClassCastException: class java.lang.Integer cannot be cast to class java.lang.String (java.lang.Integer and java.lang.String are in module java.base of loader 'bootstrap')
at Test.throwClassCastException(Test.java:302) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.catchClassCastException(Test.java:392) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.throwAndCatchAllExceptions(Test.java:489) [file:@CMAKE_BINARY_DIR@/test/Test.class]
@@ -128,8 +130,8 @@ Exception in thread "main" java.lang.ClassCastException: java.lang.Integer canno
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.lang.UnsatisfiedLinkError in method java.lang.Runtime.load0()
Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute path of the library: xyzzy
- at java.lang.Runtime.load0(Runtime.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Runtime.class]
- at java.lang.System.load(System.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/System.class]
+ at java.base/java.lang.Runtime.load0(Runtime.java:LINENO) [jrt:/java.base/java/lang/Runtime.class]
+ at java.base/java.lang.System.load(System.java:LINENO) [jrt:/java.base/java/lang/System.class]
at Test.loadLibrary(Test.java:325) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.catchUnsatisfiedLinkErrorUserLibrary(Test.java:422) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.throwAndCatchAllExceptions(Test.java:491) [file:@CMAKE_BINARY_DIR@/test/Test.class]
@@ -137,9 +139,9 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.lang.UnsatisfiedLinkError in method java.lang.ClassLoader.loadLibrary()
Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.library.path
- at java.lang.ClassLoader.loadLibrary(ClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/ClassLoader.class]
- at java.lang.Runtime.loadLibrary0(Runtime.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Runtime.class]
- at java.lang.System.loadLibrary(System.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/System.class]
+ at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:LINENO) [jrt:/java.base/java/lang/ClassLoader.class]
+ at java.base/java.lang.Runtime.loadLibrary0(Runtime.java:LINENO) [jrt:/java.base/java/lang/Runtime.class]
+ at java.base/java.lang.System.loadLibrary(System.java:LINENO) [jrt:/java.base/java/lang/System.class]
at Test.loadSystemLibrary(Test.java:336) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.catchUnsatisfiedLinkErrorSystemLibrary(Test.java:437) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.throwAndCatchAllExceptions(Test.java:492) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/testdriver b/test/testdriver
index b02bc5c..ff71685 100644
--- a/test/testdriver
+++ b/test/testdriver
@@ -29,12 +29,7 @@ else
cp $4 $TMP_RESULT
fi
-JAVA_RTLIB_PATH=`sed -n "s/^.*\(jar:file:\)\(.*\)\(\/rt.jar\!.*\).*$/\2/p" $TMP_RESULT | head -1`
-
-if [ -n "$JAVA_RTLIB_PATH" ]; then
- sed -i "s,"$JAVA_RTLIB_PATH",JAVA_AND_SYSTEM_SPECIFIC_PATH," $TMP_RESULT
- sed -i "s/\(\.java:\)[0-9]\+\() \[.*JAVA_AND_SYSTEM_SPECIFIC_PATH\)/\1LINENO\2/" $TMP_RESULT
-fi
+sed -i "s/\(\.java:\)[0-9]\+\() \[jrt:.*\]\)/\1LINENO\2/" $TMP_RESULT
diff -u $3 $TMP_RESULT
EC=$?
--
2.26.2

80
0006-test-RemoteTest-Don-t-call-URLClassLoader.addURL.patch Normal file
View file

@ -0,0 +1,80 @@
From e6cbfae1b59a4339275b88cfde8f7c3e22fdea75 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 09:06:10 +0200
Subject: [PATCH 6/8] =?UTF-8?q?test:=20RemoteTest:=20Don=E2=80=99t=20call?=
=?UTF-8?q?=20URLClassLoader.addURL()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It’s a protected method and some future version of Java will start
restricting access via reflection, so let’s just use the legal way.
---
test/RemoteTest.java | 8 +++-----
test/outputs/run_remote.log.in | 20 ++++++++++----------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/test/RemoteTest.java b/test/RemoteTest.java
index 040384f..e92e6f5 100644
--- a/test/RemoteTest.java
+++ b/test/RemoteTest.java
@@ -83,19 +83,17 @@ public class RemoteTest {
input.close();
try {
- Method method = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class});
- method.setAccessible(true);
- method.invoke(ClassLoader.getSystemClassLoader(), new Object[]{remoteJarUrl});
+ ClassLoader loader = URLClassLoader.newInstance(new URL[]{remoteJarUrl}, ClassLoader.getSystemClassLoader());
/* Loaded these classes into cache. */
final String needed[] = {"SimpleTest", "ThreadUncaughtException", "ThreadCaughtException"};
for (String requiredClass : needed) {
- if (null == Class.forName(requiredClass)) {
+ if (null == Class.forName(requiredClass, true, loader)) {
System.out.println("Cannot get required class: " + requiredClass);
System.exit(1);
}
}
- testClassInstance = Class.forName(testClassName);
+ testClassInstance = Class.forName(testClassName, true, loader);
}
finally {
server.stop(0);
diff --git a/test/outputs/run_remote.log.in b/test/outputs/run_remote.log.in
index 31ef171..00bf701 100644
--- a/test/outputs/run_remote.log.in
+++ b/test/outputs/run_remote.log.in
@@ -3,19 +3,19 @@ Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: Index 42 ou
at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class]
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class]
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/DelegatingMethodAccessorImpl.class]
- at java.lang.reflect.Method.invoke(Method.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/reflect/Method.class]
- at RemoteTest.main(RemoteTest.java:110) [file:@CMAKE_BINARY_DIR@/test/RemoteTest.class]
+ at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jrt:/java.base/jdk/internal/reflect/NativeMethodAccessorImpl.class]
+ at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:LINENO) [jrt:/java.base/jdk/internal/reflect/NativeMethodAccessorImpl.class]
+ at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:LINENO) [jrt:/java.base/jdk/internal/reflect/DelegatingMethodAccessorImpl.class]
+ at java.base/java.lang.reflect.Method.invoke(Method.java:LINENO) [jrt:/java.base/java/lang/reflect/Method.class]
+ at RemoteTest.main(RemoteTest.java:108) [file:@CMAKE_BINARY_DIR@/test/RemoteTest.class]
executable: @CMAKE_BINARY_DIR@/test/RemoteTest.class
Uncaught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
Exception in thread "main" java.lang.NullPointerException
at SimpleTest.throwNullPointerException(SimpleTest.java:36) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
- at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class]
- at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class]
- at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/reflect/DelegatingMethodAccessorImpl.class]
- at java.lang.reflect.Method.invoke(Method.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/reflect/Method.class]
- at RemoteTest.main(RemoteTest.java:112) [file:@CMAKE_BINARY_DIR@/test/RemoteTest.class]
+ at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jrt:/java.base/jdk/internal/reflect/NativeMethodAccessorImpl.class]
+ at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:LINENO) [jrt:/java.base/jdk/internal/reflect/NativeMethodAccessorImpl.class]
+ at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:LINENO) [jrt:/java.base/jdk/internal/reflect/DelegatingMethodAccessorImpl.class]
+ at java.base/java.lang.reflect.Method.invoke(Method.java:LINENO) [jrt:/java.base/java/lang/reflect/Method.class]
+ at RemoteTest.main(RemoteTest.java:110) [file:@CMAKE_BINARY_DIR@/test/RemoteTest.class]
executable: @CMAKE_BINARY_DIR@/test/RemoteTest.class
--
2.26.2

36
0007-test-output-run_remote_thread-Adjust-thread-indices.patch Normal file
View file

@ -0,0 +1,36 @@
From c33aab10b138056be8ba7ea87f9d8ccd69bbc113 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 10 Jun 2020 09:08:57 +0200
Subject: [PATCH 7/8] test: output: run_remote_thread: Adjust thread indices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I don’t know, seems that now the code starts only three, instead of
five, as intended.
---
test/outputs/run_remote_thread.log.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/outputs/run_remote_thread.log.in b/test/outputs/run_remote_thread.log.in
index a871ad0..4acfea7 100644
--- a/test/outputs/run_remote_thread.log.in
+++ b/test/outputs/run_remote_thread.log.in
@@ -1,12 +1,12 @@
Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
-Exception in thread "Thread-3" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
+Exception in thread "Thread-1" java.lang.ArrayIndexOutOfBoundsException: Index 42 out of bounds for length 10
at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at ThreadCaughtException.run(ThreadCaughtException.java:7) [jar:http://localhost:54321/JarTest.jar!/ThreadCaughtException.class]
executable: http://localhost:54321/JarTest.jar
Uncaught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
-Exception in thread "Thread-4" java.lang.NullPointerException
+Exception in thread "Thread-2" java.lang.NullPointerException
at SimpleTest.throwNullPointerException(SimpleTest.java:36) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [jar:http://localhost:54321/JarTest.jar!/SimpleTest.class]
at ThreadUncaughtException.run(ThreadUncaughtException.java:7) [jar:http://localhost:54321/JarTest.jar!/ThreadUncaughtException.class]
--
2.26.2

43
0008-test-Replace-search-paths-in-exceptions.patch Normal file
View file

@ -0,0 +1,43 @@
From 306a56211556a5683f9a2d5a1356c41ab8d27200 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ekulik@redhat.com>
Date: Wed, 17 Jun 2020 09:05:13 +0200
Subject: [PATCH 8/8] test: Replace search paths in exceptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Those we cannot predict ahead of time, so let’s use some substitution
magic.
---
test/outputs/run_test.log.in | 2 +-
test/testdriver | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/outputs/run_test.log.in b/test/outputs/run_test.log.in
index ae4a894..f3898fd 100644
--- a/test/outputs/run_test.log.in
+++ b/test/outputs/run_test.log.in
@@ -138,7 +138,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.lang.UnsatisfiedLinkError in method java.lang.ClassLoader.loadLibrary()
-Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.library.path
+Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.library.path: [PATHS]
at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:LINENO) [jrt:/java.base/java/lang/ClassLoader.class]
at java.base/java.lang.Runtime.loadLibrary0(Runtime.java:LINENO) [jrt:/java.base/java/lang/Runtime.class]
at java.base/java.lang.System.loadLibrary(System.java:LINENO) [jrt:/java.base/java/lang/System.class]
diff --git a/test/testdriver b/test/testdriver
index ff71685..29aa44f 100644
--- a/test/testdriver
+++ b/test/testdriver
@@ -30,6 +30,7 @@ else
fi
sed -i "s/\(\.java:\)[0-9]\+\() \[jrt:.*\]\)/\1LINENO\2/" $TMP_RESULT
+sed -i 's/\(no .* in java\.library\.path: \)\[.*\]/\1[PATHS]/' $TMP_RESULT
diff -u $3 $TMP_RESULT
EC=$?
--
2.26.2

14
abrt-java-connector.spec
View file

@ -4,7 +4,7 @@
Name: abrt-java-connector
Version: 1.1.5
Release: 3%{?dist}
Release: 4%{?dist}
Summary: JNI Agent library converting Java exceptions to ABRT problems
Group: System Environment/Libraries
@ -16,7 +16,14 @@ Source0: %{url}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
%endif
Patch0001: Adapt-to-different-exception-messages-in-Java-11.patch
Patch0001: 0001-Adapt-to-different-exception-messages-in-Java-11.patch
Patch0002: 0002-Drop-unused-test-output-files.patch
Patch0003: 0003-Add-indices-to-out-of-bounds-exception-output-files.patch
Patch0004: 0004-test-bad_class-Adapt-output-to-Java-11.patch
Patch0005: 0005-Adapt-more-test-ouput-to-Java-11.patch
Patch0006: 0006-test-RemoteTest-Don-t-call-URLClassLoader.addURL.patch
Patch0007: 0007-test-output-run_remote_thread-Adjust-thread-indices.patch
Patch0008: 0008-test-Replace-search-paths-in-exceptions.patch
BuildRequires: pkgconfig(abrt) >= 2.14.1
BuildRequires: check-devel
@ -104,6 +111,9 @@ make test || {
%changelog
* Wed Jun 17 2020 Ernestas Kulik <ekulik@redhat.com> - 1.1.5-4
- Add more patches for Java 11 compatibility
* Wed Jun 10 2020 Ernestas Kulik <ekulik@redhat.com> - 1.1.5-3
- Add patch for Java 11 compatibility