Limit Java only tests to one architecture using jdk_test_arch

Temporarily include Zero-based architectures in jdk_test_arch until they are portable

Resolves: RHEL-47082

java-1.8.0-openjdk.spec

@@ -141,6 +141,13 @@
 %else
 %global portable_build_arches %{aarch64} %{ix86} %{power64} x86_64 %{zero_arches}
 %endif
+# Architecture on which we run Java only tests
+%if 0%{?centos} == 0
+# Temporarily include zero_arches until we can use a portable Zero build
+%global jdk_test_arch x86_64 %{zero_arches}
+%else
+%global jdk_test_arch x86_64
+%endif
 
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
@@ -2410,22 +2417,53 @@ export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}
 export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
 %endif
 
-# Check unlimited policy has been used
+# Only test on one architecture (the fastest) for Java only tests
-$JAVA_HOME/bin/javac -d . %{SOURCE13}
+%ifarch %{jdk_test_arch}
-$JAVA_HOME/bin/java TestCryptoLevel
 
-# Check ECC is working
+  # Check unlimited policy has been used
-$JAVA_HOME/bin/javac -d . %{SOURCE14}
+  $JAVA_HOME/bin/javac -d . %{SOURCE13}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
+  $JAVA_HOME/bin/java TestCryptoLevel
 
-# Check system crypto (policy) is active and can be disabled
+  # Check ECC is working
-# Test takes a single argument - true or false - to state whether system
+  $JAVA_HOME/bin/javac -d . %{SOURCE14}
-# security properties are enabled or not.
+  $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
-$JAVA_HOME/bin/javac -d . %{SOURCE15}
+
-export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
+  # Check system crypto (policy) is active and can be disabled
-export SEC_DEBUG="-Djava.security.debug=properties"
+  # Test takes a single argument - true or false - to state whether system
-$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
+  # security properties are enabled or not.
-$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+  $JAVA_HOME/bin/javac -d . %{SOURCE15}
+  export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
+  export SEC_DEBUG="-Djava.security.debug=properties"
+  $JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
+  $JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
+
+  # Check correct vendor values have been set
+  $JAVA_HOME/bin/javac -d . %{SOURCE16}
+  $JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
+
+  # Check translations are available for new timezones
+  $JAVA_HOME/bin/javac -d . %{SOURCE18}
+  $JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
+
+  # Check src.zip has all sources. See RHBZ#1130490
+  unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
+
+  # Check class files include useful debugging information
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
+  $JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
+
+  # Check generated class files include useful debugging information
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
+  $JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
+
+%else
+
+  # Just run a basic java -version test on other architectures
+  $JAVA_HOME/bin/java -version
+
+%endif
 
 # Check java launcher has no SSB mitigation
 if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
@@ -2437,14 +2475,6 @@ nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
 if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
 %endif
 
-# Check correct vendor values have been set
-$JAVA_HOME/bin/javac -d . %{SOURCE16}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" %{oj_vendor_url} %{oj_vendor_bug_url}
-
-# Check translations are available for new timezones
-$JAVA_HOME/bin/javac -d . %{SOURCE18}
-$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
-
 # Check debug symbols are present and can identify code
 find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
 do
@@ -2511,19 +2541,6 @@ EOF
 grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
 %endif
 
-# Check src.zip has all sources. See RHBZ#1130490
-unzip -l $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'
-
-# Check class files include useful debugging information
-$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
-$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
-$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
-
-# Check generated class files include useful debugging information
-$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
-$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
-$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
-
 # build cycles check
 done
 
@@ -2925,8 +2942,11 @@ cjc.mainProgram(args)
 - Sync the copy of the portable specfile with the latest update
 - Update NEWS file and rename remove-intree-libraries.sh so portable can be rebuilt
 - Document policy repacking script and rename to correct spelling and style
+- Limit Java only tests to one architecture using jdk_test_arch
+- Temporarily include Zero-based architectures in jdk_test_arch until they are portable
 - Related: RHEL-46858
 - Resolves: RHEL-47057
+- Resolves: RHEL-47082
 
 * Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.412.b08-3
 - Bump rpmrelease for CentOS build