From cfc8fa99178aec98825087e02f4eb745defe5064 Mon Sep 17 00:00:00 2001 From: Simon Frankenberger Date: Tue, 4 Oct 2022 06:27:56 +0000 Subject: [PATCH] testing/java-jtreg: upgrade to 6.1_p2 --- testing/java-jtreg/APKBUILD | 35 ++++--- testing/java-jtreg/fix-build-script.patch | 110 -------------------- testing/java-jtreg/fix-build.patch | 11 ++ testing/java-jtreg/fix-version-number.patch | 27 ----- 4 files changed, 29 insertions(+), 154 deletions(-) delete mode 100644 testing/java-jtreg/fix-build-script.patch create mode 100644 testing/java-jtreg/fix-build.patch delete mode 100644 testing/java-jtreg/fix-version-number.patch diff --git a/testing/java-jtreg/APKBUILD b/testing/java-jtreg/APKBUILD index 5406486f439..abfc3554ce8 100644 --- a/testing/java-jtreg/APKBUILD +++ b/testing/java-jtreg/APKBUILD @@ -1,30 +1,30 @@ # Contributor: Simon Frankenberger # Maintainer: Simon Frankenberger pkgname=java-jtreg -pkgver=5.1_p01 -_pkgver=${pkgver/_p/-b} -pkgrel=2 +pkgver=6.1_p2 +_pkgver=${pkgver/_p/+} +pkgrel=0 pkgdesc="jtreg is the test harness used by the JDK test framework" url="https://github.com/openjdk/jtreg" -arch="noarch !riscv64" # blocked by openjdk8 +# riscv64: java +# s390x: java +arch="noarch !riscv64 !s390x" license="GPL-2.0" depends="java-jtharness java-asmtools" -makedepends="openjdk8 zip" # explicitly required java 8 to compile +makedepends="bash openjdk8 zip" # explicitly required java 8 to compile options="!check" # the tests require an X11 or VNC display #subpackages="$pkgname-doc:_doc $pkgname-examples:_examples" -source="jtreg-$_pkgver.tar.bz2::https://github.com/openjdk/jtreg/archive/jtreg$_pkgver.tar.gz +source="jtreg-$_pkgver.tar.gz::https://github.com/openjdk/jtreg/archive/jtreg-$_pkgver.tar.gz + fix-build.patch -jtreg-symlink-patch.txt -jtdiff-symlink-patch.txt -fix-version-number.patch -fix-build-script.patch + jtreg-symlink-patch.txt + jtdiff-symlink-patch.txt " -builddir="$srcdir/jtreg-jtreg$_pkgver" +builddir="$srcdir/jtreg-jtreg-${pkgver/_p/-}" build() { - builddir="$builddir" \ - TAG_INFO="jtreg$_pkgver" \ - ash make/build-all.sh /usr/lib/jvm/default-jvm + JAVA_HOME=/usr/lib/jvm/default-jvm \ + bash make/build.sh } package() { @@ -64,8 +64,9 @@ _doc() { "$_destdir" } -sha512sums="64277f72847b6c182cd00fee39c817a1c510d7e6eef0dd01f3642d4ca661cd5215330ef4627e3557d4ba9eb212bdca3ef6539f1b5c0f72ba617c5a18063ef990 jtreg-5.1-b01.tar.bz2 +sha512sums=" +f3a9d08dc805592cc99ef322b672254a91913513e2c350bfd3b242774994aba3464f7c32c1c2684d154d0e939b979c20efd18172bf0e23e6219b91c8d0144e54 jtreg-6.1+2.tar.gz +20b2c7069d0c5f7b505d430135176335ab8d63d4c8869375cbd4930e6416065a2c70195aaaae28899f45f643353ece3dc1319a76a09a67783f23c68e76e98a35 fix-build.patch 136e6e58b85d05f3e97467344c95303cbd310ada7c6533a129a6e62786d5e9498a1842b75de9838b432e68d0d863058ac5aeeea2a78e98a2170b4a0c1c113083 jtreg-symlink-patch.txt 67f63317a2aaedd17e822389065ff5d86d574f4cb2e2af375856a9c7356dd048c396517372788b889db376fe4aa73c66d530938b8975d11d7714ac84e3dcd00d jtdiff-symlink-patch.txt -769de697c43c8aeb68945f5c0f5fd42925e3cae422b732bc1c771d261ef947d1e0c865225e0384208262facad20a74f97c2905c9828215ccc24d997ee06a1356 fix-version-number.patch -a8dcf8038f8b5578a9b0580d167513933a3582f2f6d0b7230630d7abbb0e4fff1aa98f9d4e5be6a6a2fb2bbc660a5c53bd5d6ad6772bbda20c74dc3d28ba7aae fix-build-script.patch" +" diff --git a/testing/java-jtreg/fix-build-script.patch b/testing/java-jtreg/fix-build-script.patch deleted file mode 100644 index 1bc8e9e6609..00000000000 --- a/testing/java-jtreg/fix-build-script.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- old/make/Defs.gmk -+++ new/make/Defs.gmk -@@ -411,7 +411,7 @@ - SORT = /usr/bin/sort - TEST = /usr/bin/test - TIDY = /usr/bin/tidy --TOUCH = /usr/bin/touch -+TOUCH = /bin/touch - UNZIP = /usr/bin/unzip - WC = /usr/bin/wc - ZIP = /usr/bin/zip ---- old/make/build-all.sh -+++ new/make/build-all.sh -@@ -60,35 +60,10 @@ - if [ $CYGWIN -eq 1 ]; then echo `cygpath -m $1`; else echo $1; fi - } - --get_scm_type() { -- if [ -d .hg ]; then -- echo "HG" -- elif [ -d .git ]; then -- echo "GIT" -- else -- echo "Error: unrecognized repository, it must be Git or Mercurial" >&2 -- exit 1 -- fi --} -- --SCM_TYPE=`get_scm_type` -- - get_root() { -- case $SCM_TYPE in -- HG) hg root ;; -- GIT) git rev-parse --show-toplevel ;; -- *) echo "Error: unknown SCM" >&2 ; exit 1 ;; -- esac -+ echo $builddir - } - --get_tag_info() { -- case $SCM_TYPE in -- HG) hg tags | grep jtreg | head -1 ;; -- GIT) git tag | grep jtreg | tail -1 ;; -- *) echo "Error: unknown SCM" >&2 ; exit 1 ;; -- esac --} -- - export JAVA_HOME=$1 - export PATH="$JAVA_HOME:$PATH" - -@@ -147,7 +122,7 @@ - ANT_VERSION=${ANT_VERSION:-apache-ant-1.9.4} - ANT_ZIP=${ANT_DIR}/${ANT_VERSION}.zip - WGet ${APACHE_ANT_URL}/${ANT_VERSION}-bin.zip ${ANT_ZIP} --echo "ec57a35eb869a307abdfef8712f3688fff70887f ${ANT_ZIP}" | ${SHASUM} --check - -+echo "ec57a35eb869a307abdfef8712f3688fff70887f ${ANT_ZIP}" | ${SHASUM} -c - - ${UNZIP} ${UNZIP_OPTS} -d ${ANT_DIR} ${ANT_ZIP} - - ANT_JAR=${ANT_DIR}/${ANT_VERSION}/lib/ant.jar -@@ -210,17 +185,17 @@ - ASM_JAR=${JCOV_DEPS_DIR}/asm-6.2.jar - ASM_JAR_CHECKSUM='1b6c4ff09ce03f3052429139c2a68e295cae6604' - WGet ${MAVEN_REPO_URL}/org/ow2/asm/asm/6.2/asm-6.2.jar ${ASM_JAR} --echo "${ASM_JAR_CHECKSUM} ${ASM_JAR}" | ${SHASUM} --check - -+echo "${ASM_JAR_CHECKSUM} ${ASM_JAR}" | ${SHASUM} -c - - - ASM_TREE_JAR=${JCOV_DEPS_DIR}/asm-tree-6.2.jar - ASM_TREE_JAR_CHECKSUM='61570e046111559f38d4e0e580c005f75988c0a6' - WGet ${MAVEN_REPO_URL}/org/ow2/asm/asm-tree/6.2/asm-tree-6.2.jar ${ASM_TREE_JAR} --echo "${ASM_TREE_JAR_CHECKSUM} ${ASM_TREE_JAR}" | ${SHASUM} --check - -+echo "${ASM_TREE_JAR_CHECKSUM} ${ASM_TREE_JAR}" | ${SHASUM} -c - - - ASM_UTIL_JAR=${JCOV_DEPS_DIR}/asm-utils-6.2.jar - ASM_UTIL_JAR_CHECKSUM='a9690730f92cc79eeadc20e400ebb41eccce10b1' - WGet ${MAVEN_REPO_URL}/org/ow2/asm/asm-util/6.2/asm-util-6.2.jar ${ASM_UTIL_JAR} --echo "${ASM_UTIL_JAR_CHECKSUM} ${ASM_UTIL_JAR}" | ${SHASUM} --check - -+echo "${ASM_UTIL_JAR_CHECKSUM} ${ASM_UTIL_JAR}" | ${SHASUM} -c - - - # Build jcov - JCOV_SRC_ZIP=${JCOV_BUILD_DIR}/source.zip -@@ -263,7 +238,7 @@ - - JUNIT_JAR=${JUNIT_DEPS_DIR}/junit-4.10.jar - WGet ${MAVEN_REPO_URL}/junit/junit/4.10/junit-4.10.jar ${JUNIT_JAR} --echo "e4f1766ce7404a08f45d859fb9c226fc9e41a861 ${JUNIT_JAR}" | ${SHASUM} --check - -+echo "e4f1766ce7404a08f45d859fb9c226fc9e41a861 ${JUNIT_JAR}" | ${SHASUM} -c - - - ${UNZIP} ${UNZIP_OPTS} ${JUNIT_JAR} LICENSE.txt -d ${JUNIT_DEPS_DIR} - JUNIT_LICENSE=${JUNIT_DEPS_DIR}/LICENSE.txt -@@ -274,18 +249,17 @@ - - TESTNG_JAR=${TESTNG_DEPS_DIR}/testng-6.9.5.jar - WGet ${MAVEN_REPO_URL}/org/testng/testng/6.9.5/testng-6.9.5.jar ${TESTNG_JAR} --echo "5d12ea207fc47c3f341a3f8ecc88a3eac396a777 ${TESTNG_JAR}" | ${SHASUM} --check - -+echo "5d12ea207fc47c3f341a3f8ecc88a3eac396a777 ${TESTNG_JAR}" | ${SHASUM} -c - - - TESTNG_LICENSE=${TESTNG_DEPS_DIR}/LICENSE.txt - WGet https://raw.githubusercontent.com/cbeust/testng/testng-6.9.5/LICENSE.txt ${TESTNG_LICENSE} - - JCOMMANDER_JAR=${TESTNG_DEPS_DIR}/jcommander-1.72.jar - WGet ${MAVEN_REPO_URL}/com/beust/jcommander/1.72/jcommander-1.72.jar ${JCOMMANDER_JAR} --echo "6375e521c1e11d6563d4f25a07ce124ccf8cd171 ${JCOMMANDER_JAR}" | ${SHASUM} --check - -+echo "6375e521c1e11d6563d4f25a07ce124ccf8cd171 ${JCOMMANDER_JAR}" | ${SHASUM} -c - - - - ## Set version and build numbers to the latest tagged version by default --TAG_INFO=`get_tag_info` - if [ -z ${BUILD_NUMBER:-} ]; then - BUILD_NUMBER=`echo $TAG_INFO | sed 's/jtreg\([0-9]\.[0-9]\)-\(b[0-9]*\).*/\2/'` - fi diff --git a/testing/java-jtreg/fix-build.patch b/testing/java-jtreg/fix-build.patch new file mode 100644 index 00000000000..860643f7301 --- /dev/null +++ b/testing/java-jtreg/fix-build.patch @@ -0,0 +1,11 @@ +--- old/make/Defs.gmk ++++ new/make/Defs.gmk +@@ -432,7 +432,7 @@ + SORT = /usr/bin/sort + TEST = /usr/bin/test + TIDY = /usr/bin/tidy +-TOUCH = /usr/bin/touch ++TOUCH = /bin/touch + UNZIP = /usr/bin/unzip + WC = /usr/bin/wc + ZIP = /usr/bin/zip diff --git a/testing/java-jtreg/fix-version-number.patch b/testing/java-jtreg/fix-version-number.patch deleted file mode 100644 index 086d7e42230..00000000000 --- a/testing/java-jtreg/fix-version-number.patch +++ /dev/null @@ -1,27 +0,0 @@ -The 5.1b01 release has the wrong version information set, so correct them - ---- old/make/Defs.gmk -+++ new/make/Defs.gmk -@@ -445,9 +445,9 @@ - # Version tags - # - # BUILD_* variables are normally set (overridden) by RE builds --BUILD_VERSION = 5.0 -+BUILD_VERSION = 5.1 - BUILD_MILESTONE = dev --BUILD_NUMBER = b00 -+BUILD_NUMBER = b01 - - # don't eval dates here directly, because that leads to unstable builds - #BUILD_YEAR:sh = /bin/date +"%Y" ---- old/make/build.properties -+++ new/make/build.properties -@@ -65,6 +65,6 @@ - # checkstyle (should be version 5.4 or better) - checkstyle.home = ${jtreg.build.resources}/checkstyle/5.4 - --build.version = 5.0 -+build.version = 5.1 - build.milestone = dev --build.number = b00 -+build.number = b01