8000 Fix Base Testsuite timeouts on Windows by Pepo48 · Pull Request #19744 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Fix Base Testsuite timeouts on Windows #19744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmuzikar merged 2 commits into from
Apr 25, 2023
Merged

Fix Base Testsuite timeouts on Windows #19744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1ecf5
Revert "Fix of ant configure.xml to be able to build integration-arqu…
Pepo48 Apr 25, 2023
0834818
Fix Base Testsuite timeouts on Windows
Pepo48 Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions quarkus/dist/src/main/content/bin/kc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
)

Expand Down Expand Up @@ -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
Expand All @@ -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
3 changes: 1 addition & 2 deletions testsuite/integration-arquillian/servers/auth-server/quarkus/ant/configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
0