@@ -22,7 +22,7 @@ function main() {
2222 pushd " $( dirname ${script_dir} ) "
2323 start_ldap
2424
25- local wd launch_boot assemble_code integration_test_code
25+ local wd launch_boot compile_assemble_code run_integration_tests
2626 wd=$( pwd)
2727 temp_dir=${script_dir} /tmp
2828 mkdir -p " ${temp_dir} "
@@ -58,16 +58,16 @@ function main() {
5858 -jar ${wd} /uaa/build/libs/cloudfoundry-identity-uaa-0.0.0.war \
5959 > boot.log 2>&1 &"
6060
61- readonly assemble_code =" ./gradlew '-Dspring.profiles.active=${test_profile} ' \
61+ readonly compile_assemble_code =" ./gradlew '-Dspring.profiles.active=${test_profile} ' \
6262 '-Djava.security.egd=file:/dev/./urandom' \
63- assemble \
63+ assemble compileTestJava \
6464 --no-watch-fs \
6565 --no-daemon \
6666 --max-workers=4 \
6767 --stacktrace \
6868 --console=plain"
6969
70- readonly integration_test_code =" ./gradlew \
70+ readonly run_integration_tests =" ./gradlew \
7171 '-Dspring.profiles.active=${test_profile} ' \
7272 '-Djava.security.egd=file:/dev/./urandom' \
7373 '-DskipUaaAutoStart=true' \
@@ -80,7 +80,7 @@ function main() {
8080
8181 set -x
8282 if [[ " ${RUN_TESTS:- true} " = ' true' ]]; then
83- eval " $assemble_code "
83+ eval " $compile_assemble_code "
8484
8585 # Start and ensure the boot server is running before integration tests
8686 eval " $launch_boot "
@@ -101,7 +101,7 @@ function main() {
101101 -XX:G1HeapRegionSize=1m \
102102 -Xmx1024m \
103103 "
104- eval " $integration_test_code "
104+ eval " $run_integration_tests "
105105
106106 # Clean up: kill the boot server
107107 if [[ -f boot.pid ]]; then
@@ -111,7 +111,7 @@ function main() {
111111 rm boot.pid
112112 fi
113113 else
114- echo " $integration_test_code "
114+ echo " $run_integration_tests "
115115 bash
116116 fi
117117 popd
0 commit comments