mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 22:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/java-jtreg: upgrade to 7.2b1

Browse Source
This commit is contained in:
Simon Frankenberger 2023-04-25 04:44:32 +00:00 committed by alice
parent 12e3c90724
commit 6f0a714404
3 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
testing/java-jtreg/APKBUILD
View File

@ -1,21 +1,27 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=java-jtreg pkgname=java-jtreg
pkgver=6.1_p2 pkgver=7.2_p1
_pkgver=${pkgver/_p/+} _pkgver=${pkgver/_p/+}
pkgrel=0 pkgrel=0
pkgdesc="jtreg is the test harness used by the JDK test framework" pkgdesc="jtreg is the test harness used by the JDK test framework"
url="https://github.com/openjdk/jtreg" url="https://github.com/openjdk/jtreg"
# riscv64: java # oracle dropped support for 32 bit
# s390x: java # riscv64 blocked by openjdk11
arch="noarch !riscv64 !s390x" # s390x due to java-asmtools
arch="all !x86 !armhf !armv7 !riscv64 !s390x"
license="GPL-2.0" license="GPL-2.0"
depends="java-jtharness java-asmtools" depends="java-jtharness java-asmtools apache-ant"
makedepends="bash openjdk8 zip" # explicitly required java 8 to compile makedepends="bash openjdk11 zip" # explicitly requires java 11 to compile
options="!check" # the tests require an X11 or VNC display checkdepends="diffutils grep"
#subpackages="$pkgname-doc:_doc $pkgname-examples:_examples"
# check gets stuck on builder
[ "$CARCH" = "ppc64le" ] && options="$options !check"
source="jtreg-$_pkgver.tar.gz::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 fix-build.patch
headless-tests.patch
jtreg-symlink-patch.txt jtreg-symlink-patch.txt
jtdiff-symlink-patch.txt jtdiff-symlink-patch.txt
@ -23,8 +29,31 @@ source="jtreg-$_pkgver.tar.gz::https://github.com/openjdk/jtreg/archive/jtreg-$_
builddir="$srcdir/jtreg-jtreg-${pkgver/_p/-}" builddir="$srcdir/jtreg-jtreg-${pkgver/_p/-}"
build() { build() {
JAVA_HOME=/usr/lib/jvm/default-jvm \ export JTREG_BUILD_VERSION="${_pkgver%+*}" \
bash make/build.sh JTREG_BUILD_NUMBER="${_pkgver/*+}"
local ant_home=/usr/share/java/apache-ant
export ANT="$ant_home"/bin/ant \
ANT_JAR="$ant_home"/lib/ant.jar
local asmtools_home=/usr/share/java/asmtools
export ASMTOOLS_JAR="$asmtools_home"/lib/asmtools.jar \
ASMTOOLS_LICENSE="$asmtools_home"/LICENSE
local jtharness_home=/usr/share/java/jtharness
export JTHARNESS_JAVATEST_JAR="$jtharness_home"/lib/javatest.jar \
JTHARNESS_LICENSE="$jtharness_home"/legal/license.txt \
JTHARNESS_COPYRIGHT="$jtharness_home"/legal/copyright.txt
bash make/build.sh \
--jdk /usr/lib/jvm/java-11-openjdk \
-- \
-j1
}
check() {
sed -i 's/-j1/quick-test/' build/make.sh
bash build/make.sh
} }
package() { package() {
@ -65,8 +94,9 @@ _doc() {
} }
sha512sums=" sha512sums="
f3a9d08dc805592cc99ef322b672254a91913513e2c350bfd3b242774994aba3464f7c32c1c2684d154d0e939b979c20efd18172bf0e23e6219b91c8d0144e54 jtreg-6.1+2.tar.gz e708302538ad1b29d97e2838949ecc3fff5b10c6d73c8dd1a52da02770272dc9ac7f6ed25de90e1b317768e961ef2bde9550c94a6bf9a4ab6894d1beca0d9623 jtreg-7.2+1.tar.gz
20b2c7069d0c5f7b505d430135176335ab8d63d4c8869375cbd4930e6416065a2c70195aaaae28899f45f643353ece3dc1319a76a09a67783f23c68e76e98a35 fix-build.patch 2c4bcfdc7792bacdb9c5ed81feb52bbbb1cdcbe8ac1cb9c9c6e1e5c6474ede625a748829a75c12cbd0cba57582f69006221ec7d3f7e999d116955022575697ff fix-build.patch
1b10c0b3f27541d2456166930c925d32db95b6a7d73625df8340a61f781b85d3bfb0d50f3099bdd448b498c0c9be8e7dd8ab0646142592c2538a291ab4a579b8 headless-tests.patch
136e6e58b85d05f3e97467344c95303cbd310ada7c6533a129a6e62786d5e9498a1842b75de9838b432e68d0d863058ac5aeeea2a78e98a2170b4a0c1c113083 jtreg-symlink-patch.txt 136e6e58b85d05f3e97467344c95303cbd310ada7c6533a129a6e62786d5e9498a1842b75de9838b432e68d0d863058ac5aeeea2a78e98a2170b4a0c1c113083 jtreg-symlink-patch.txt
67f63317a2aaedd17e822389065ff5d86d574f4cb2e2af375856a9c7356dd048c396517372788b889db376fe4aa73c66d530938b8975d11d7714ac84e3dcd00d jtdiff-symlink-patch.txt 67f63317a2aaedd17e822389065ff5d86d574f4cb2e2af375856a9c7356dd048c396517372788b889db376fe4aa73c66d530938b8975d11d7714ac84e3dcd00d jtdiff-symlink-patch.txt
" "

6
testing/java-jtreg/fix-build.patch
View File

@ -1,9 +1,9 @@
--- old/make/Defs.gmk --- old/make/Defs.gmk
+++ new/make/Defs.gmk +++ new/make/Defs.gmk
@@ -432,7 +432,7 @@ @@ -173,7 +173,7 @@
SORT = /usr/bin/sort else
TEST = /usr/bin/test
TIDY = /usr/bin/tidy TIDY = /usr/bin/tidy
endif
-TOUCH = /usr/bin/touch -TOUCH = /usr/bin/touch
+TOUCH = /bin/touch +TOUCH = /bin/touch
UNZIP = /usr/bin/unzip UNZIP = /usr/bin/unzip

17
testing/java-jtreg/headless-tests.patch Normal file
View File

@ -0,0 +1,17 @@
From: Simon Frankenberger <simon-alpine@fraho.eu>
Subject: Run tests in headless mode
Could't figure out how to make them run with xvfb-run, so just disable the ui tests
diff -ru old/test/basic/Basic.gmk new/test/basic/Basic.gmk
--- old/test/basic/Basic.gmk 2023-03-04 00:55:23.000000000 +0000
+++ new/test/basic/Basic.gmk 2023-04-25 13:41:38.485264258 +0000
@@ -55,7 +55,7 @@
#----------------------------------------------------------------------
-ENVVARS="DISPLAY=$${DISPLAY:-`uname -n`:0.0}"
+ENVVARS="-Djava.awt.headless=true"
ifeq ($(OS_NAME), windows)
BASIC_TESTS := $(shell cygpath -m $(abspath $(TESTDIR)/share/basic) )