diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2020-03-21 19:26:10 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-21 20:37:17 +0000 |
| commit | 9f7e0ed1daf07982c2fd9d4428641514d1f1647a (patch) | |
| tree | 429502ca077eee5ed1c6f8455a1fee9f2b75976a | |
| parent | ae1642e14cc016b495875e24d2362c53e111f6ca (diff) | |
| download | aports-9f7e0ed1daf07982c2fd9d4428641514d1f1647a.tar.bz2 aports-9f7e0ed1daf07982c2fd9d4428641514d1f1647a.tar.xz | |
testing/java-jtreg: Upgrade to 5.0_p01
| -rw-r--r-- | testing/java-jtreg/APKBUILD | 24 | ||||
| -rw-r--r-- | testing/java-jtreg/disable-gcc-error.patch | 23 |
2 files changed, 36 insertions, 11 deletions
diff --git a/testing/java-jtreg/APKBUILD b/testing/java-jtreg/APKBUILD index ac67318ae8..0222481868 100644 --- a/testing/java-jtreg/APKBUILD +++ b/testing/java-jtreg/APKBUILD @@ -1,25 +1,26 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=java-jtreg -_pkgver=4.2-b13 -pkgver=${_pkgver/-/.} +pkgver=5.0_p01 +_pkgver=${pkgver/_p/-b} pkgrel=0 pkgdesc="jtreg is the test harness used by the JDK test framework" -url="http://hg.openjdk.java.net/code-tools/jtreg" +url="https://hg.openjdk.java.net/code-tools/jtreg" arch="noarch" license="GPL-2.0" depends="java-jtharness java-asmtools" makedepends="openjdk8 zip" options="!check" # the tests require an X11 or VNC display #subpackages="$pkgname-doc:_doc $pkgname-examples:_examples" -source="jtreg-$pkgver.tar.bz2::http://hg.openjdk.java.net/code-tools/jtreg/archive/jtreg$_pkgver.tar.bz2 -http://ftp-stud.hs-esslingen.de/pub/Mirrors//ftp.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.zip -http://central.maven.org/maven2/junit/junit/4.10/junit-4.10.jar -http://central.maven.org/maven2/org/testng/testng/6.9.5/testng-6.9.5.jar -http://central.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar +source="jtreg-$_pkgver.tar.bz2::https://hg.openjdk.java.net/code-tools/jtreg/archive/jtreg$_pkgver.tar.bz2 +https://archive.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.tar.bz2 +https://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar +https://repo1.maven.org/maven2/org/testng/testng/6.9.5/testng-6.9.5.jar +https://repo1.maven.org/maven2/com/beust/jcommander/1.72/jcommander-1.72.jar jtreg-symlink-patch.txt jtdiff-symlink-patch.txt +disable-gcc-error.patch " builddir="$srcdir/jtreg-jtreg$_pkgver" @@ -75,10 +76,11 @@ _doc() { "$_destdir" } -sha512sums="b0ecbf8a38e5913e3e26cc92435f82d2db7201ef931c756a6106c23fe9dc07b7b2a21651e92b01e3c89cc01a831bbd7be02f7e55c60733af9430f7641c419246 jtreg-4.2.b13.tar.bz2 -873062cf789e1572ec4ef3cdbb15c0d3a57e5a0794068591565367d4cec15b9f9a24f59734a85170d61b23eb9288d6bafd35a9ae2b015b09c7a175e344cb4e1c apache-ant-1.9.13-bin.zip +sha512sums="1e78df0e4b23688bf92a67f86efa759f0a3399ae7adea5b5a8d26a0e0385fea3033a127d32e256694040aa157267b40ea9bd7a4df76af901ee945b3a2e26dbcb jtreg-5.0-b01.tar.bz2 +e9b602aacbac7bf721a830f56ea06cde60a7a674a6d67f05ce82848ac01b2ee84f7003190286fea1030abb523398fa1a280d265377f41f57e7cf7e6d1fe37465 apache-ant-1.9.13-bin.tar.bz2 2c8b595c24a5ad2499a5bd5bb01204453cd09f51308fea5834922e042b8f39bd8ef0099848eb3a8576ddc4ce4ec907181ba0c20f1222a25b3064d1c3c5499cbd junit-4.10.jar 15a6d6a3c29e6212d18c299e905620ff743825029129ce44d70cadbff589873bfc983f79b9a50052b85b03c8dac25ef5cf9de1628e10db980a4ac94c66173475 testng-6.9.5.jar 2da86589ff7ecbb53cfce845887155bca7400ecf2fdfdef7113ea03926a195a1cbcf0c071271df6bedc5cdfa185c6576f67810f6957cd9b60ab3600a4545420e jcommander-1.72.jar c12bb37a378bf15a2d73b3bd4aadf122dfb60860dda640cb909d62517cb13e7471f76d849598aacb88ef73a119cb45eb1c52165b98faa3dca112ab9f528e2f55 jtreg-symlink-patch.txt -67f63317a2aaedd17e822389065ff5d86d574f4cb2e2af375856a9c7356dd048c396517372788b889db376fe4aa73c66d530938b8975d11d7714ac84e3dcd00d jtdiff-symlink-patch.txt" +67f63317a2aaedd17e822389065ff5d86d574f4cb2e2af375856a9c7356dd048c396517372788b889db376fe4aa73c66d530938b8975d11d7714ac84e3dcd00d jtdiff-symlink-patch.txt +6ff4b114ae60257250545300d54e4beb1a6c4e1bd28fc8838479ee4b2c0ed1b0123aac36ff38abfc741f680795e6be2744ff637f3e5a5f655ba38aef1a1d4c80 disable-gcc-error.patch" diff --git a/testing/java-jtreg/disable-gcc-error.patch b/testing/java-jtreg/disable-gcc-error.patch new file mode 100644 index 0000000000..5470787937 --- /dev/null +++ b/testing/java-jtreg/disable-gcc-error.patch @@ -0,0 +1,23 @@ +--- old/make/Defs.gmk ++++ new/make/Defs.gmk +@@ -160,17 +160,17 @@ + # for files needed to run othervm tests on oldest supported platforms + REGTEST_OLD_JAVAC = $(JDKHOME)/bin/javac + REGTEST_OLD_JAVAC_OPTIONS = \ +- $(OLD_JAVAC_SOURCE_TARGET) $(JDK15_BOOTCLASSPATH) -Xlint:all,-options -Werror ++ $(OLD_JAVAC_SOURCE_TARGET) $(JDK15_BOOTCLASSPATH) -Xlint:all,-options + + # for files needed to run agentvm tests (on platforms back to JDK 1.5) + REGTEST_AGENT_JAVAC = $(JDKHOME)/bin/javac + REGTEST_AGENT_JAVAC_OPTIONS = \ +- $(AGENT_JAVAC_SOURCE_TARGET) $(JDK15_BOOTCLASSPATH) -Xlint:all,-options -Werror ++ $(AGENT_JAVAC_SOURCE_TARGET) $(JDK15_BOOTCLASSPATH) -Xlint:all,-options + + # for files needed for jtreg tool + REGTEST_TOOL_JAVAC = $(JDKHOME)/bin/javac + REGTEST_TOOL_JAVAC_OPTIONS = \ +- $(TOOL_JAVAC_SOURCE_TARGET) $(JDK18_BOOTCLASSPATH) -Xlint:all,-options -Werror ++ $(TOOL_JAVAC_SOURCE_TARGET) $(JDK18_BOOTCLASSPATH) -Xlint:all,-options + + #----- JavaHelp + # |