[tomee-tck] branch tomee-10-with-ee-91 updated: Put back the echo/exec change committed by accident. Don't add quotes to the JAVA_HOME environment variable on Windows.

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch tomee-10-with-ee-91
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git


The following commit(s) were added to refs/heads/tomee-10-with-ee-91 by this push:
     new bc3a0d4  Put back the echo/exec change committed by accident. Don't add quotes to the JAVA_HOME environment variable on Windows.
bc3a0d4 is described below

commit bc3a0d4576b217d113514f5866da96c83401c3b5
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Aug 7 16:16:03 2023 +0100

    Put back the echo/exec change committed by accident. Don't add quotes to the JAVA_HOME environment variable on Windows.
---
 runtests                                                    | 4 ++--
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/runtests b/runtests
index cd95d8c..b5025b2 100755
--- a/runtests
+++ b/runtests
@@ -339,7 +339,7 @@ egrep '(javaee|jakarta).(ri|cts).home' ~/.m2/settings.xml | perl -pe 's,^ *|<[^>
 
 # Fire up Maven to do the real work
 if [ -z $nc ]; then
-echo mvn -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
       --batch-mode \
       --errors \
       $CONFIG \
@@ -355,7 +355,7 @@ echo mvn -V --file "$DIRNAME/pom.xml" \
                -e "s/\(\[ERROR\].*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}/g" \
                -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
 else
-echo mvn -V --file "$DIRNAME/pom.xml" \
+exec mvn -V --file "$DIRNAME/pom.xml" \
       --batch-mode \
       --errors \
       $CONFIG \
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 998f4ab..1413982 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -147,9 +147,11 @@ class JavaTestCommand
         // HACK: For some reason, need to quote JAVA_HOME on Windows...
         //
         def javaHome = require('java.home')
-        if (SystemUtils.IS_OS_WINDOWS) {
-            javaHome = "'${javaHome}'"
-        }
+        // JRG: I commented this out, as this appeared to append the content of the JAVA_HOME environment variable to the current working directory
+        // on Windows 11 for me. 2023-08-07
+        //if (SystemUtils.IS_OS_WINDOWS) {
+        //    javaHome = "${javaHome}"
+        //}
         
         ant.mkdir(dir: workingDir)