Blob Blame Raw
From 2f5da8dbb85c74cc0df0ec8223282c92351fcea3 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Fri, 25 Oct 2013 16:32:52 +0200
Subject: [PATCH 06/39] Adapt tests to the recent changes in formats

Related to rhbz#1023081
Related to rhbz#1055581
---
 test/outputs/Linux-armv7l/run_test.log.in  | 34 +++++++++++++++---------------
 test/outputs/Linux-ppc/run_test.log.in     | 34 +++++++++++++++---------------
 test/outputs/Linux-ppc64/run_test.log.in   | 34 +++++++++++++++---------------
 test/outputs/Linux-s390/run_test.log.in    | 34 +++++++++++++++---------------
 test/outputs/Linux-s390x/run_test.log.in   | 34 +++++++++++++++---------------
 test/outputs/run.log.in                    |  4 ++--
 test/outputs/run_bad_class.log.in          |  2 +-
 test/outputs/run_inner.log.in              |  4 ++--
 test/outputs/run_jar.log.in                |  4 ++--
 test/outputs/run_missing_class_test.log.in |  2 +-
 test/outputs/run_package.log.in            |  4 ++--
 test/outputs/run_remote.log.in             |  4 ++--
 test/outputs/run_test.log.in               | 34 +++++++++++++++---------------
 test/outputs/run_threads.log.in            |  4 ++--
 test/outputs/run_try_finally.log.in        |  4 ++--
 15 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/test/outputs/Linux-armv7l/run_test.log.in b/test/outputs/Linux-armv7l/run_test.log.in
index 768ff41..5c9e7f7 100644
--- a/test/outputs/Linux-armv7l/run_test.log.in
+++ b/test/outputs/Linux-armv7l/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.<init>() with signature (Ljava/io/File;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.InetAddress$1.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.doConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.AbstractPlainSocketImpl.doConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/Linux-ppc/run_test.log.in b/test/outputs/Linux-ppc/run_test.log.in
index 768ff41..5c9e7f7 100644
--- a/test/outputs/Linux-ppc/run_test.log.in
+++ b/test/outputs/Linux-ppc/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.<init>() with signature (Ljava/io/File;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.InetAddress$1.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.doConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.AbstractPlainSocketImpl.doConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/Linux-ppc64/run_test.log.in b/test/outputs/Linux-ppc64/run_test.log.in
index 768ff41..5c9e7f7 100644
--- a/test/outputs/Linux-ppc64/run_test.log.in
+++ b/test/outputs/Linux-ppc64/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.<init>() with signature (Ljava/io/File;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.InetAddress$1.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.doConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.AbstractPlainSocketImpl.doConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/Linux-s390/run_test.log.in b/test/outputs/Linux-s390/run_test.log.in
index 768ff41..5c9e7f7 100644
--- a/test/outputs/Linux-s390/run_test.log.in
+++ b/test/outputs/Linux-s390/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.<init>() with signature (Ljava/io/File;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.InetAddress$1.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.doConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.AbstractPlainSocketImpl.doConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/Linux-s390x/run_test.log.in b/test/outputs/Linux-s390x/run_test.log.in
index 768ff41..5c9e7f7 100644
--- a/test/outputs/Linux-s390x/run_test.log.in
+++ b/test/outputs/Linux-s390x/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.<init>() with signature (Ljava/io/File;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.<init>() with signature (Ljava/io/File;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.InetAddress$1.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.doConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.AbstractPlainSocketImpl.doConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/run.log.in b/test/outputs/run.log.in
index 8ab7269..4dc5c62 100644
--- a/test/outputs/run.log.in
+++ b/test/outputs/run.log.in
@@ -1,10 +1,10 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	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]
 	at SimpleTest.main(SimpleTest.java:81) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method SimpleTest.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at SimpleTest.throwNullPointerException(SimpleTest.java:36) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
 	at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
diff --git a/test/outputs/run_bad_class.log.in b/test/outputs/run_bad_class.log.in
index 237950b..a540d89 100644
--- a/test/outputs/run_bad_class.log.in
+++ b/test/outputs/run_bad_class.log.in
@@ -1,4 +1,4 @@
-Uncaught java.lang.ClassNotFoundException exception in thread "main" in a method java.lang.ClassLoader.loadClass() with signature (Ljava/lang/String;Z)Ljava/lang/Class;
+Uncaught exception java.lang.ClassNotFoundException in method java.lang.ClassLoader.loadClass()
 Exception in thread "main" java.lang.ClassNotFoundException: foobar
 	at java.net.URLClassLoader$1.run(URLClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URLClassLoader$1.class]
 	at java.net.URLClassLoader$1.run(URLClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URLClassLoader$1.class]
diff --git a/test/outputs/run_inner.log.in b/test/outputs/run_inner.log.in
index 054456e..4789aeb 100644
--- a/test/outputs/run_inner.log.in
+++ b/test/outputs/run_inner.log.in
@@ -1,11 +1,11 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	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]
 	at InnerExceptions.run(InnerExceptions.java:11) [file:@CMAKE_BINARY_DIR@/test/InnerExceptions.class]
 	at InnerExceptions.main(InnerExceptions.java:28) [file:@CMAKE_BINARY_DIR@/test/InnerExceptions.class]
-Uncaught java.lang.RuntimeException exception in thread "main" in a method InnerExceptions.run() with signature ()V
+Uncaught exception java.lang.RuntimeException in method InnerExceptions.run()
 Exception in thread "main" java.lang.RuntimeException: java.lang.NullPointerException
 	at InnerExceptions.run(InnerExceptions.java:17) [file:@CMAKE_BINARY_DIR@/test/InnerExceptions.class]
 	at InnerExceptions.main(InnerExceptions.java:28) [file:@CMAKE_BINARY_DIR@/test/InnerExceptions.class]
diff --git a/test/outputs/run_jar.log.in b/test/outputs/run_jar.log.in
index f863306..6e10d2d 100644
--- a/test/outputs/run_jar.log.in
+++ b/test/outputs/run_jar.log.in
@@ -1,10 +1,10 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at SimpleTest.throwIndexOutOfBoundsException(SimpleTest.java:24) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
 	at SimpleTest.catchIndexOutOfBoundsException(SimpleTest.java:47) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
 	at SimpleTest.throwAndCatchAllExceptions(SimpleTest.java:61) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
 	at SimpleTest.main(SimpleTest.java:81) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method SimpleTest.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at SimpleTest.throwNullPointerException(SimpleTest.java:36) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
 	at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [jar:file:@CMAKE_BINARY_DIR@/test/JarTest.jar!/SimpleTest.class]
diff --git a/test/outputs/run_missing_class_test.log.in b/test/outputs/run_missing_class_test.log.in
index 377d67a..df77057 100644
--- a/test/outputs/run_missing_class_test.log.in
+++ b/test/outputs/run_missing_class_test.log.in
@@ -1,4 +1,4 @@
-Uncaught java.lang.ClassNotFoundException exception in thread "main" in a method java.lang.ClassLoader.loadClass() with signature (Ljava/lang/String;Z)Ljava/lang/Class;
+Uncaught exception java.lang.ClassNotFoundException in method java.lang.ClassLoader.loadClass()
 Exception in thread "main" java.lang.ClassNotFoundException: MissingClassTest
 	at java.net.URLClassLoader$1.run(URLClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URLClassLoader$1.class]
 	at java.net.URLClassLoader$1.run(URLClassLoader.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URLClassLoader$1.class]
diff --git a/test/outputs/run_package.log.in b/test/outputs/run_package.log.in
index fd1f590..d8fbc79 100644
--- a/test/outputs/run_package.log.in
+++ b/test/outputs/run_package.log.in
@@ -1,10 +1,10 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method com.redhat.abrt.test.Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method com.redhat.abrt.test.Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at com.redhat.abrt.test.Test.throwIndexOutOfBoundsException(Test.java:26) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
 	at com.redhat.abrt.test.Test.catchIndexOutOfBoundsException(Test.java:49) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
 	at com.redhat.abrt.test.Test.throwAndCatchAllExceptions(Test.java:63) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
 	at com.redhat.abrt.test.Test.main(Test.java:82) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method com.redhat.abrt.test.Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method com.redhat.abrt.test.Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at com.redhat.abrt.test.Test.throwNullPointerException(Test.java:38) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
 	at com.redhat.abrt.test.Test.throwAndDontCatchException(Test.java:72) [file:@CMAKE_BINARY_DIR@/test/com/redhat/abrt/test/Test.class]
diff --git a/test/outputs/run_remote.log.in b/test/outputs/run_remote.log.in
index a3f93fe..a18e90d 100644
--- a/test/outputs/run_remote.log.in
+++ b/test/outputs/run_remote.log.in
@@ -1,4 +1,4 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	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]
@@ -8,7 +8,7 @@ Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	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:83) [file:@CMAKE_BINARY_DIR@/test/RemoteTest.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method SimpleTest.throwNullPointerException() with signature ()V
+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]
diff --git a/test/outputs/run_test.log.in b/test/outputs/run_test.log.in
index 02970e8..95f477b 100644
--- a/test/outputs/run_test.log.in
+++ b/test/outputs/run_test.log.in
@@ -1,18 +1,18 @@
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.open() with signature (Ljava/lang/String;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
 Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileInputStream.open() with signature (Ljava/lang/String;)V
+Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileInputStream.open(Native Method) [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 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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method java.io.FileOutputStream.open() with signature (Ljava/lang/String;Z)V
+Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open()
 Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
 	at java.io.FileOutputStream.open(Native Method) [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]
@@ -20,7 +20,7 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Integer.parseInt() with signature (Ljava/lang/String;I)I
+Caught exception java.lang.NumberFormatException in method java.lang.Integer.parseInt()
 Exception in thread "main" java.lang.NumberFormatException: null
 	at java.lang.Integer.parseInt(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
 	at java.lang.Integer.<init>(Integer.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Integer.class]
@@ -38,7 +38,7 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.Inet6AddressImpl.lookupAllHostAddr() with signature (Ljava/lang/String;)[Ljava/net/InetAddress;
+Caught exception java.net.UnknownHostException in method java.net.Inet6AddressImpl.lookupAllHostAddr()
 Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
 	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Inet6AddressImpl.class]
 	at java.net.InetAddress$1.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$1.class]
@@ -52,7 +52,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service
 	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]
-Caught java.net.UnknownHostException exception in thread "main" in a method java.net.AbstractPlainSocketImpl.connect() with signature (Ljava/net/SocketAddress;I)V
+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]
@@ -63,7 +63,7 @@ Exception in thread "main" java.net.UnknownHostException: xyzzy
 	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]
-Caught java.net.ConnectException exception in thread "main" in a method java.net.PlainSocketImpl.socketConnect() with signature (Ljava/net/InetAddress;II)V
+Caught exception java.net.ConnectException in method java.net.PlainSocketImpl.socketConnect()
 Exception in thread "main" java.net.ConnectException: 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]
@@ -77,7 +77,7 @@ Exception in thread "main" java.net.ConnectException: Connection refused
 	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]
-Caught java.lang.NumberFormatException exception in thread "main" in a method java.lang.Long.parseLong() with signature (Ljava/lang/String;I)J
+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]
@@ -86,14 +86,14 @@ Exception in thread "main" java.lang.NumberFormatException: null
 	at Test.readFromURL(Test.java:237) [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]
-Caught java.io.FileNotFoundException exception in thread "main" in a method sun.net.www.protocol.http.HttpURLConnection.getInputStream() with signature ()Ljava/io/InputStream;
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
 Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
 	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 Test.readFromURL(Test.java:237) [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]
-Caught java.net.MalformedURLException exception in thread "main" in a method java.net.URL.<init>() with signature (Ljava/net/URL;Ljava/lang/String;Ljava/net/URLStreamHandler;)V
+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]
@@ -101,32 +101,32 @@ Exception in thread "main" java.net.MalformedURLException: no protocol: @#$%^&ma
 	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]
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method Test.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method Test.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	at Test.throwIndexOutOfBoundsException(Test.java:266) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchIndexOutOfBoundsException(Test.java:347) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	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]
-Caught java.lang.StringIndexOutOfBoundsException exception in thread "main" in a method java.lang.String.charAt() with signature (I)C
+Caught exception java.lang.StringIndexOutOfBoundsException in method java.lang.String.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 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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.catchNullPointerException(Test.java:377) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndCatchAllExceptions(Test.java:488) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.ClassCastException exception in thread "main" in a method Test.throwClassCastException() with signature ()V
+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
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.Runtime.load0() with signature (Ljava/lang/Class;Ljava/lang/String;)V
+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]
@@ -134,7 +134,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: Expecting an absolute
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Caught java.lang.UnsatisfiedLinkError exception in thread "main" in a method java.lang.ClassLoader.loadLibrary() with signature (Ljava/lang/Class;Ljava/lang/String;Z)V
+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]
@@ -143,7 +143,7 @@ Exception in thread "main" java.lang.UnsatisfiedLinkError: no xyzzy in java.libr
 	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]
 	at Test.main(Test.java:515) [file:@CMAKE_BINARY_DIR@/test/Test.class]
-Uncaught java.lang.NullPointerException exception in thread "main" in a method Test.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method Test.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at Test.throwNullPointerException(Test.java:290) [file:@CMAKE_BINARY_DIR@/test/Test.class]
 	at Test.throwAndDontCatchException(Test.java:501) [file:@CMAKE_BINARY_DIR@/test/Test.class]
diff --git a/test/outputs/run_threads.log.in b/test/outputs/run_threads.log.in
index 902cb3c..ad80099 100644
--- a/test/outputs/run_threads.log.in
+++ b/test/outputs/run_threads.log.in
@@ -1,10 +1,10 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "Thread-0" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "Thread-0" java.lang.ArrayIndexOutOfBoundsException: 42
 	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]
 	at ThreadCaughtException.run(MultiThreadTest.java:13) [file:@CMAKE_BINARY_DIR@/test/ThreadCaughtException.class]
-Uncaught java.lang.NullPointerException exception in thread "Thread-1" in a method SimpleTest.throwNullPointerException() with signature ()V
+Uncaught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
 Exception in thread "Thread-1" java.lang.NullPointerException
 	at SimpleTest.throwNullPointerException(SimpleTest.java:36) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
 	at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
diff --git a/test/outputs/run_try_finally.log.in b/test/outputs/run_try_finally.log.in
index 0b02bc6..d690017 100644
--- a/test/outputs/run_try_finally.log.in
+++ b/test/outputs/run_try_finally.log.in
@@ -1,11 +1,11 @@
-Caught java.lang.ArrayIndexOutOfBoundsException exception in thread "main" in a method SimpleTest.throwIndexOutOfBoundsException() with signature ()V
+Caught exception java.lang.ArrayIndexOutOfBoundsException in method SimpleTest.throwIndexOutOfBoundsException()
 Exception in thread "main" java.lang.ArrayIndexOutOfBoundsException: 42
 	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]
 	at TryFinallyTest.run(TryFinallyTest.java:13) [file:@CMAKE_BINARY_DIR@/test/TryFinallyTest.class]
 	at TryFinallyTest.main(TryFinallyTest.java:27) [file:@CMAKE_BINARY_DIR@/test/TryFinallyTest.class]
-Caught java.lang.NullPointerException exception in thread "main" in a method SimpleTest.throwNullPointerException() with signature ()V
+Caught exception java.lang.NullPointerException in method SimpleTest.throwNullPointerException()
 Exception in thread "main" java.lang.NullPointerException
 	at SimpleTest.throwNullPointerException(SimpleTest.java:36) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
 	at SimpleTest.throwAndDontCatchException(SimpleTest.java:71) [file:@CMAKE_BINARY_DIR@/test/SimpleTest.class]
-- 
1.8.3.1