[Git][java-team/jtreg7][master] 3 commits: d/t/self-test: pass JAVA_SPECIFICATION_VERSION to make.

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg7


Commits:
9ba29abd by Vladimir Petko at 2025-04-08T08:44:38+12:00
d/t/self-test: pass JAVA_SPECIFICATION_VERSION to make.

- - - - -
2907f0e5 by Vladimir Petko at 2025-04-08T08:55:52+12:00
changelog

- - - - -
532edcdf by Tony Mancill at 2025-04-08T00:37:41+00:00
Merge branch 'autopkgtest_fail' into 'master'

Fix autopkgtest failure

See merge request java-team/jtreg7!8
- - - - -


2 changed files:

- debian/changelog
- debian/tests/self-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jtreg7 (7.5.1+1+ds1-3) UNRELEASED; urgency=medium
+
+  * d/t/self-test: pass JAVA_SPECIFICATION_VERSION to make to fix
+    autopkgtest regression (Closes: #1102171).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 08 Apr 2025 08:14:26 +1200
+
 jtreg7 (7.5.1+1+ds1-2) unstable; urgency=medium
 
   * Fix ftbfs in backports (Closes: #1102171):


=====================================
debian/tests/self-test
=====================================
@@ -4,6 +4,12 @@ export JTREG_HOME="/usr/share/jtreg"
 export JAVA_HOME="/usr/lib/jvm/default-java"
 mkdir -p "${AUTOPKGTEST_TMP}/build/classes/com/sun/javatest/regtest/tool"
 
+JAVA_VERSION=`${JAVA_HOME}/bin/java -version 2>&1`
+JAVA_SPECIFICATION_VERSION=`echo "${JAVA_VERSION}" | \
+    grep -e ^java -e ^openjdk | \
+    head -n 1 | \
+    sed -e 's/^[^0-9]*\(1\.\)*\([1-9][0-9]*\).*/\2/'`
+
 PARALLEL_TESTS=`nproc --all`
 # be safe for 32bit architectures
 if [ "$PARALLEL_TESTS" -gt 2 ]; then
@@ -25,4 +31,5 @@ make -j${PARALLEL_TESTS} -C make \
     JAVATEST_JAR=${JTREG_HOME}/lib/javatest.jar \
     BUILD_MILESTONE=src \
     JDKHOME="${JAVA_HOME}" \
+    JAVA_SPECIFICATION_VERSION=${JAVA_SPECIFICATION_VERSION} \
     test



View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/d1dcaf5561329488ba5086eebd9e1c8a2f3c2656...532edcdffde982d7d9aa32a0d7f6e9012df49385

-- 
View it on GitLab: https://salsa.debian.org/java-team/jtreg7/-/compare/d1dcaf5561329488ba5086eebd9e1c8a2f3c2656...532edcdffde982d7d9aa32a0d7f6e9012df49385
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250408/4642ada2/attachment.htm>