From d9592ff941bb1b24e153dfc9d82dbfee670b1318 Mon Sep 17 00:00:00 2001
From: Peter Zaoral <pzaoral@redhat.com>
Date: Tue, 25 Apr 2023 17:49:19 +0200
Subject: [PATCH] Fix Base Testsuite timeouts on Windows (#19944)

(cherry picked from commit 78958ae4348f879bf91ea59fae6c8a793ccf8bd2)
---
 quarkus/dist/src/main/content/bin/kc.bat                    | 6 +++---
 .../servers/auth-server/quarkus/ant/configure.xml           | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/quarkus/dist/src/main/content/bin/kc.bat b/quarkus/dist/src/main/content/bin/kc.bat
index 336d4cce7b7..ddf4559055a 100644
--- a/quarkus/dist/src/main/content/bin/kc.bat
+++ b/quarkus/dist/src/main/content/bin/kc.bat
@@ -128,7 +128,7 @@ if "x%JAVA_HOME%" == "x" (
        echo "%JAVA_HOME%\bin\java.exe" does not exist
        goto END
      )
-    set JAVA=%JAVA_HOME%\bin\java
+    set "JAVA=%JAVA_HOME%\bin\java"
   )
 )
 
@@ -159,7 +159,7 @@ set START_SERVER=true
 if "!CONFIG_ARGS:%OPTIMIZED_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%BUILD_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%HELP_LONG_OPTION%=!"=="!CONFIG_ARGS!" if "%IS_HELP_SHORT%" == "false" (
     setlocal enabledelayedexpansion
 
-    %JAVA% -Dkc.config.build-and-exit=true %JAVA_RUN_OPTS%
+    "%JAVA%" -Dkc.config.build-and-exit=true %JAVA_RUN_OPTS%
 
     if not !errorlevel! == 0 (
         set START_SERVER=false
@@ -169,7 +169,7 @@ if "!CONFIG_ARGS:%OPTIMIZED_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%BUILD_
 )
 
 if "%START_SERVER%" == "true" (
-    %JAVA% %JAVA_RUN_OPTS%
+    "%JAVA%" %JAVA_RUN_OPTS%
 )
 
 :END
diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/ant/configure.xml b/testsuite/integration-arquillian/servers/auth-server/quarkus/ant/configure.xml
index 258d3bd38b7..da6d362f075 100644
--- a/testsuite/integration-arquillian/servers/auth-server/quarkus/ant/configure.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/ant/configure.xml
@@ -8,8 +8,7 @@
             <arg value="--http-relative-path=/auth"/>
             <arg value="--cache=local"/>
         </exec>
-        <exec osfamily="windows" executable="cmd" dir="${auth.server.home}/bin" failonerror="true">
-            <arg value="kc.bat" />
+        <exec osfamily="windows" executable="${auth.server.home}/bin/kc.bat" failonerror="true">
             <arg value="build"/>
             <arg value="--http-relative-path=/auth"/>
             <arg value="--cache=local"/>