Support OpenJDK-1.8
This commit is contained in:
Jakub Filak
parent
63219ac4f6
commit
4bfb13858d
6 changed files with 1552 additions and 43 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,3 +9,4 @@
|
|||
/abrt-java-connector-1.0.8-39322b0.tar.gz
|
||||
/abrt-java-connector-1.0.9-c933894.tar.gz
|
||||
/abrt-java-connector-1.0.10-fdf80c5.tar.gz
|
||||
/abrt-java-connector-1.1.0-230b726.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
From f6d7c30415898c73a3b1c207d2acb496f53f67ee Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Thu, 30 Oct 2014 09:36:49 +0100
|
||||
Subject: [PATCH 1/3] Decrease the tested memory limits because of failures on
|
||||
arm
|
||||
|
||||
Related to #42
|
||||
---
|
||||
test/Test.java | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/Test.java b/test/Test.java
|
||||
index cd4acf4..cbbc113 100644
|
||||
--- a/test/Test.java
|
||||
+++ b/test/Test.java
|
||||
@@ -71,8 +71,8 @@ public class Test {
|
||||
{ int[] intArray1D = new int[DIM_SIZE * DIM_SIZE]; }
|
||||
/* allocated size = 4096*4096*4 bytes */
|
||||
{ int[][] intArray2D = new int[DIM_SIZE][DIM_SIZE]; }
|
||||
- { double[] doubleArray1D = new double[DIM_SIZE * DIM_SIZE]; }
|
||||
- { double[][] doubleArray2D = new double[DIM_SIZE][DIM_SIZE]; }
|
||||
+ { double[] doubleArray1D = new double[DIM_SIZE * (DIM_SIZE/2)]; }
|
||||
+ { double[][] doubleArray2D = new double[DIM_SIZE][DIM_SIZE/2]; }
|
||||
|
||||
// string could be allocated using some base array
|
||||
{ String s = new String(new byte[DIM_SIZE * DIM_SIZE]); }
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,33 +1,80 @@
|
|||
From 079ebced0f614c21b0ed7fc15a4039667394e6fd Mon Sep 17 00:00:00 2001
|
||||
From 0495592c727a624d12e7840ec62d4d60370ed5d3 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Fri, 9 May 2014 12:34:04 +0200
|
||||
Subject: [PATCH] Add test results for Linux-ppc64le
|
||||
Date: Thu, 30 Oct 2014 11:41:08 +0100
|
||||
Subject: [PATCH 2/3] Adapt the arm test outputs to java-1.8
|
||||
|
||||
Related to rhbz#981682
|
||||
Related to #42
|
||||
---
|
||||
test/CMakeLists.txt | 2 +-
|
||||
test/outputs/Linux-ppc64le/run_test.log.in | 167 +++++++++++++++++++++++++++++
|
||||
2 files changed, 168 insertions(+), 1 deletion(-)
|
||||
create mode 100644 test/outputs/Linux-ppc64le/run_test.log.in
|
||||
test/outputs/Linux-armv7l/run_test.log.in | 33 +---
|
||||
test/outputs/Linux-armv7l/run_test.log.in.java-1.7 | 167 +++++++++++++++++++++
|
||||
2 files changed, 175 insertions(+), 25 deletions(-)
|
||||
create mode 100644 test/outputs/Linux-armv7l/run_test.log.in.java-1.7
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 5717c10..6cc888b 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -259,7 +259,7 @@ _add_test(run_cut_reason_message 2)
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^s390x?$")
|
||||
set(STRESS_TEST_REPEATS 30)
|
||||
set(STRESS_TEST_THREADS 200)
|
||||
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^ppc\(64\)?$")
|
||||
+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^ppc\(64\)?\(le\)?$")
|
||||
set(STRESS_TEST_REPEATS 20)
|
||||
set(STRESS_TEST_THREADS 150)
|
||||
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^armv7l$")
|
||||
diff --git a/test/outputs/Linux-ppc64le/run_test.log.in b/test/outputs/Linux-ppc64le/run_test.log.in
|
||||
diff --git a/test/outputs/Linux-armv7l/run_test.log.in b/test/outputs/Linux-armv7l/run_test.log.in
|
||||
index 2a41f50..3d83a66 100644
|
||||
--- a/test/outputs/Linux-armv7l/run_test.log.in
|
||||
+++ b/test/outputs/Linux-armv7l/run_test.log.in
|
||||
@@ -23,29 +23,10 @@ Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permiss
|
||||
at Test.fileRelatedIssues(Test.java:463) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
executable: @CMAKE_BINARY_DIR@/test/Test.class
|
||||
-Caught exception java.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]
|
||||
- at sun.net.InetAddressCachePolicy.<clinit>(InetAddressCachePolicy.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/InetAddressCachePolicy.class]
|
||||
- at java.net.InetAddress$Cache.getPolicy(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$Cache.class]
|
||||
- at java.net.InetAddress$Cache.put(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$Cache.class]
|
||||
- at java.net.InetAddress.cacheInitIfNeeded(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetAddress.getCachedAddresses(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetAddress.getAllByName0(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetAddress.getByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
- at java.net.InetSocketAddress.<init>(InetSocketAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetSocketAddress.class]
|
||||
- at java.net.Socket.<init>(Socket.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/Socket.class]
|
||||
- at Test.readFromUnknownHost(Test.java:157) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
- at Test.networkRelatedIssues(Test.java:473) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
- at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
-executable: @CMAKE_BINARY_DIR@/test/Test.class
|
||||
-Caught exception java.net.UnknownHostException in method java.net.InetAddress$1.lookupAllHostAddr()
|
||||
-Exception in thread "main" java.net.UnknownHostException: xyzzy: Name or service not known
|
||||
+Caught exception java.net.UnknownHostException in method java.net.InetAddress$2.lookupAllHostAddr()
|
||||
+Exception in thread "main" java.net.UnknownHostException: xyzzy: unknown error
|
||||
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]
|
||||
+ at java.net.InetAddress$2.lookupAllHostAddr(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress$2.class]
|
||||
at java.net.InetAddress.getAddressesFromNameService(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
at java.net.InetAddress.getAllByName0(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
at java.net.InetAddress.getAllByName(InetAddress.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/InetAddress.class]
|
||||
@@ -88,17 +69,19 @@ Caught exception java.lang.NumberFormatException in method java.lang.Long.parseL
|
||||
Exception in thread "main" java.lang.NumberFormatException: null
|
||||
at java.lang.Long.parseLong(Long.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Long.class]
|
||||
at java.lang.Long.parseLong(Long.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/lang/Long.class]
|
||||
+ at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
|
||||
at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
|
||||
at java.net.URL.openStream(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
|
||||
- at Test.readFromURL(Test.java:237) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
+ at Test.readFromURL(Test.java:238) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
at Test.networkRelatedIssues(Test.java:475) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
executable: @CMAKE_BINARY_DIR@/test/Test.class
|
||||
-Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream()
|
||||
+Caught exception java.io.FileNotFoundException in method sun.net.www.protocol.http.HttpURLConnection.getInputStream0()
|
||||
Exception in thread "main" java.io.FileNotFoundException: http://localhost:54321/_this_does_not_exists_
|
||||
+ at sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
|
||||
at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/sun/net/www/protocol/http/HttpURLConnection.class]
|
||||
at java.net.URL.openStream(URL.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/net/URL.class]
|
||||
- at Test.readFromURL(Test.java:237) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
+ at Test.readFromURL(Test.java:238) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
at Test.networkRelatedIssues(Test.java:475) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
at Test.main(Test.java:514) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
executable: @CMAKE_BINARY_DIR@/test/Test.class
|
||||
diff --git a/test/outputs/Linux-armv7l/run_test.log.in.java-1.7 b/test/outputs/Linux-armv7l/run_test.log.in.java-1.7
|
||||
new file mode 100644
|
||||
index 0000000..2a41f50
|
||||
--- /dev/null
|
||||
+++ b/test/outputs/Linux-ppc64le/run_test.log.in
|
||||
+++ b/test/outputs/Linux-armv7l/run_test.log.in.java-1.7
|
||||
@@ -0,0 +1,167 @@
|
||||
+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)
|
||||
|
|
@ -197,5 +244,5 @@ index 0000000..2a41f50
|
|||
+ at Test.main(Test.java:518) [file:@CMAKE_BINARY_DIR@/test/Test.class]
|
||||
+executable: @CMAKE_BINARY_DIR@/test/Test.class
|
||||
--
|
||||
1.8.3.1
|
||||
2.1.0
|
||||
|
||||
1428
0003-Add-java-1.8-test-outputs-for-aarch-ppc-and-s390.patch
Normal file
1428
0003-Add-java-1.8-test-outputs-for-aarch-ppc-and-s390.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,9 +1,9 @@
|
|||
%global commit fdf80c5de2400437cc2fbe56f14aacbf346274df
|
||||
%global commit 230b72697c7c43db747b2644b17cb2685d1539de
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
|
||||
Name: abrt-java-connector
|
||||
Version: 1.0.10
|
||||
Release: 4%{?dist}
|
||||
Version: 1.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: JNI Agent library converting Java exceptions to ABRT problems
|
||||
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -11,13 +11,11 @@ License: GPLv2+
|
|||
URL: https://github.com/jfilak/abrt-java-connector
|
||||
Source0: https://github.com/jfilak/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
|
||||
|
||||
Patch01: 0001-Add-test-results-for-Linux-ppc64le.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: satyr-devel
|
||||
BuildRequires: libreport-devel
|
||||
BuildRequires: abrt-devel
|
||||
BuildRequires: java-1.7.0-openjdk-devel
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: check-devel
|
||||
|
|
@ -26,6 +24,10 @@ BuildRequires: git
|
|||
|
||||
Requires: abrt
|
||||
|
||||
Patch0001: 0001-Decrease-the-tested-memory-limits-because-of-failure.patch
|
||||
Patch0002: 0002-Adapt-the-arm-test-outputs-to-java-1.8.patch
|
||||
Patch0003: 0003-Add-java-1.8-test-outputs-for-aarch-ppc-and-s390.patch
|
||||
|
||||
%description
|
||||
JNI library providing an agent capable to process both caught and uncaught
|
||||
exceptions and transform them to ABRT problems
|
||||
|
|
@ -61,24 +63,26 @@ make install DESTDIR=%{buildroot}
|
|||
%{_mandir}/man5/bugzilla_formatdup_java.conf.5*
|
||||
%{_datadir}/abrt/conf.d/plugins/java.conf
|
||||
|
||||
# install only unversioned shared object because the package is a Java plugin
|
||||
# and not a system library but unfortunately the library must be placed in ld
|
||||
# library paths
|
||||
%{_libdir}/lib%{name}.so
|
||||
# Applications may use a single subdirectory under/usr/lib.
|
||||
# http://www.pathname.com/fhs/pub/fhs-2.3.html#PURPOSE22
|
||||
#
|
||||
# Java does not support multilib.
|
||||
# https://fedorahosted.org/fesco/ticket/961
|
||||
%{_prefix}/lib/abrt-java-connector
|
||||
|
||||
|
||||
%check
|
||||
make test
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
make test || {
|
||||
cat Testing/Temporary/LastTest.log
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 29 2014 Jakub Filak <jfilak@redhat.com> - 1.1.0-1
|
||||
- Support java-1.8-openjdk
|
||||
- Install the library to /usr/lib/abrt-java-connector on all arches
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.10-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
6f703b5ccecc8373c214d6298e223a13 abrt-java-connector-1.0.10-fdf80c5.tar.gz
|
||||
6bcf0a39c24bb77d6588be3573485d08 abrt-java-connector-1.1.0-230b726.tar.gz
|
||||
|
|
|
|||
Reference in a new issue