From 21f48d09e3a74cbc8435c839908cbd2b28a84174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= <david.matejcek@omnifish.ee>
Date: Wed, 17 Apr 2024 08:19:12 +0200
Subject: [PATCH] Fixed using wrong java command in TCK authentication and
 managing failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
---
 appserver/tests/tck/authentication/pom.xml | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml
index 2914781141a..c76fe2a3433 100644
--- a/appserver/tests/tck/authentication/pom.xml
+++ b/appserver/tests/tck/authentication/pom.xml
@@ -209,10 +209,12 @@
 
                                 <limit maxwait="60">
                                     <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="delete-domain"/>
                                         <arg value="domain1" />
                                     </exec>
                                     <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="create-domain"/>
                                         <arg value="--domainproperties=domain.adminPort=${port.admin}:domain.instancePort=${port.http}:http.ssl.port=${port.https}:jms.port=${port.jms}:domain.jmxPort=${port.jmx}:orb.listener.port=${port.orb}:orb.ssl.port=${port.orb.ssl}:orb.mutualauth.port=${port.orb.mutual}" />
                                         <arg value="--user=admin" />
@@ -220,6 +222,7 @@
                                         <arg value="domain1" />
                                     </exec>
                                     <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="start-domain"/>
                                     </exec>
 
@@ -227,6 +230,7 @@
                                         <isset property="jacoco.version" />
                                         <then>
                                             <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                                <env key="AS_JAVA" value="${java.home}"/>
                                                 <arg value="create-jvm-options" />
                                                 <arg value="--port=${port.admin}" />
                                                 <arg value="&quot;-javaagent\:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec,includes=${jacoco.includes}&quot;" />
@@ -234,6 +238,7 @@
                                         </then>
                                     </if>
                                     <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="stop-domain"/>
                                         <arg value="domain1"/>
                                     </exec>
@@ -266,29 +271,37 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
+
                             <target xmlns:if="ant:if" xmlns:unless="ant:unless">
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties"
                                          classpathref="maven.plugin.classpath" />
                                 <limit maxwait="20">
-                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin" failonerror="true">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="start-domain"/>
                                     </exec>
                                 </limit>
 
-                                <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+                                <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" failonerror="true">
+                                    <env key="AS_JAVA" value="${java.home}"/>
+                                    <env key="JAVA_HOME" value="${java.home}"/>
                                     <arg value="config.vi"  />
                                 </exec>
-                                <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+                                <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" failonerror="true">
+                                    <env key="AS_JAVA" value="${java.home}"/>
+                                    <env key="JAVA_HOME" value="${java.home}"/>
                                     <arg value="enable.jaspic"  />
                                 </exec>
 
                                 <!-- Restart GlassFish in debug mode if so requested -->
                                 <sequential if:set="glassfish.suspend">
-                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin" failonerror="true">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="stop-domain" />
                                     </exec>
                                     <echo message="Starting GlassFish in suspended mode, waiting on port 9009" />
-                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                    <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin" failonerror="true">
+                                        <env key="AS_JAVA" value="${java.home}"/>
                                         <arg value="start-domain"/>
                                         <arg value="--suspend" if:set="glassfish.suspend"/>
                                     </exec>
@@ -310,12 +323,19 @@
                                          classpathref="maven.plugin.classpath" />
                                 <echo level="info" message="Start running all tests" />
                                 <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" resultproperty="testResult">
+                                    <env key="AS_JAVA" value="${java.home}"/>
+                                    <env key="JAVA_HOME" value="${java.home}"/>
                                     <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
                                     <arg value="runclient.nobinaryfinder" if:set="run.test" />
                                     <arg value="run.all" unless:set="run.test" />
                                     <env key="LC_ALL" value="C" />
                                 </exec>
 
+                                <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+                                    <env key="AS_JAVA" value="${java.home}"/>
+                                    <arg value="stop-domain" />
+                                </exec>
+
                                 <if>
                                     <not>
                                         <equals arg1="${testResult}" arg2="0" />
@@ -323,13 +343,9 @@
                                     <then>
                                         <echo message="Running tests failed." />
                                         <loadfile property="contents" srcFile="${glassfish.home}/glassfish/domains/domain1/logs/server.log" />
-                                        <echo message="${contents}" />
+                                        <fail status="${testResult}" message="${contents}" />
                                     </then>
                                 </if>
-
-                                <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
-                                    <arg value="stop-domain" />
-                                </exec>
                             </target>
                         </configuration>
                     </execution>