Skip to content

Commit

Permalink
Fixed webservice_all's run_test.sh
Browse files Browse the repository at this point in the history
- common_test.sh is loaded before the run_test_id call, so it uses correct
  directory even when used runtests.sh

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
dmatej committed Sep 18, 2022
1 parent c41f308 commit a7b0577
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ test_run(){
}

run_test_id(){
source `dirname ${0}`/../../../common_test.sh
kill_process
unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
cd `dirname ${0}`
Expand All @@ -54,6 +53,7 @@ get_test_target(){

OPT=${1}
TEST_ID=${2}
source `dirname ${0}`/../../../common_test.sh
case ${OPT} in
list_test_ids )
list_test_ids;;
Expand Down
4 changes: 2 additions & 2 deletions runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ cdi_all, ql_gf_full_profile_all, \n
\n
web_jsp, deployment_all, \n
ejb_group_1. ejb_group_2, ejb_group_3, ejb_group_embedded, \n
cdi_all, ql_gf_full_profile_all, ql_gf_nucleus_all, \
ql_gf_web_profile_all, nucleus_admin_all, jdbc_all, batch_all, persistence_all, \
cdi_all, ql_gf_full_profile_all, ql_gf_nucleus_all, \n
ql_gf_web_profile_all, nucleus_admin_all, jdbc_all, batch_all, persistence_all, webservice_all, \n
connector_group_1, connector_group_2, connector_group_3, connector_group_4";

echo "If you need to use a different JAVA_HOME than is used by your system, export it or edit this script.";
Expand Down

0 comments on commit a7b0577

Please sign in to comment.