Fix Base Testsuite timeouts on Windows

This commit is contained in:
Peter Zaoral 2023-04-25 16:01:08 +02:00 committed by GitHub
parent 48354a1bb8
commit 78958ae434
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View file

@ -128,7 +128,7 @@ if "x%JAVA_HOME%" == "x" (
echo "%JAVA_HOME%\bin\java.exe" does not exist echo "%JAVA_HOME%\bin\java.exe" does not exist
goto END 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" ( 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 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 ( if not !errorlevel! == 0 (
set START_SERVER=false set START_SERVER=false
@ -169,7 +169,7 @@ if "!CONFIG_ARGS:%OPTIMIZED_OPTION%=!"=="!CONFIG_ARGS!" if "!CONFIG_ARGS:%BUILD_
) )
if "%START_SERVER%" == "true" ( if "%START_SERVER%" == "true" (
%JAVA% %JAVA_RUN_OPTS% "%JAVA%" %JAVA_RUN_OPTS%
) )
:END :END

View file

@ -8,8 +8,7 @@
<arg value="--http-relative-path=/auth"/> <arg value="--http-relative-path=/auth"/>
<arg value="--cache=local"/> <arg value="--cache=local"/>
</exec> </exec>
<exec osfamily="windows" executable="cmd" dir="${auth.server.home}/bin" failonerror="true"> <exec osfamily="windows" executable="${auth.server.home}/bin/kc.bat" failonerror="true">
<arg value="kc.bat" />
<arg value="build"/> <arg value="build"/>
<arg value="--http-relative-path=/auth"/> <arg value="--http-relative-path=/auth"/>
<arg value="--cache=local"/> <arg value="--cache=local"/>