summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2021-04-20 15:28:18 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2021-04-20 15:28:39 +0200
commitd472cb651c1e61ae9e0ceca2a7f123b3c55ff2e0 (patch)
tree819d4434d603cae03a57881d22d74790e44b7d0f
parentdev-java/jackcess: bump to 4.0.0 (diff)
downloadgentoo-d472cb651c1e61ae9e0ceca2a7f123b3c55ff2e0.tar.gz
gentoo-d472cb651c1e61ae9e0ceca2a7f123b3c55ff2e0.tar.bz2
gentoo-d472cb651c1e61ae9e0ceca2a7f123b3c55ff2e0.zip
dev-java/jackcess: fixed tests in 4.0.0 + re-added arches
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch13
-rw-r--r--dev-java/jackcess/jackcess-4.0.0.ebuild14
2 files changed, 25 insertions, 2 deletions
diff --git a/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch b/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch
new file mode 100644
index 000000000000..221710f4fbe5
--- /dev/null
+++ b/dev-java/jackcess/files/jackcess-4.0.0-fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java b/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
+index d127f9f..03885f2 100644
+--- a/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
++++ b/src/test/java/com/healthmarketscience/jackcess/DatabaseTest.java
+@@ -687,7 +687,7 @@ public class DatabaseTest extends TestCase
+
+ public void testAncientDates() throws Exception
+ {
+- TimeZone tz = TimeZone.getTimeZone("America/New_York");
++ TimeZone tz = TimeZone.getTimeZone("UTC");
+ SimpleDateFormat sdf = DatabaseBuilder.createDateFormat("yyyy-MM-dd");
+ sdf.getCalendar().setTimeZone(tz);
+
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index c46dd19bf78c..cd0a7e10eb17 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-linux"
# Common dependencies
# POM: pom.xml
@@ -43,6 +43,10 @@ RDEPEND="
S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-tests.patch"
+)
+
JAVA_GENTOO_CLASSPATH="commons-logging,commons-lang-3.6,poi"
JAVA_SRC_DIR="src/main/java"
JAVA_RESOURCE_DIRS="src/main/resources"
@@ -57,7 +61,13 @@ JAVA_TEST_EXCLUDES=(
"com.healthmarketscience.jackcess.TestUtil"
)
+src_prepare() {
+ default
+ java-utils-2_src_prepare
+}
+
src_test() {
- TZ=UTC
+ export TZ=UTC
+ export LC_ALL=C
java-pkg-simple_src_test
}