diff options
Diffstat (limited to 'test/initial_event_tests/initial_event_test_master_starter.sh')
| -rwxr-xr-x | test/initial_event_tests/initial_event_test_master_starter.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/test/initial_event_tests/initial_event_test_master_starter.sh b/test/initial_event_tests/initial_event_test_master_starter.sh index 8848f62..85607c4 100755 --- a/test/initial_event_tests/initial_event_test_master_starter.sh +++ b/test/initial_event_tests/initial_event_test_master_starter.sh @@ -31,6 +31,8 @@ if [ ! -z "$USE_LXC_TEST" ]; then ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip_lib/test; ./initial_event_test_slave_starter.sh $CLIENT_JSON_FILE $REMAINING_OPTIONS\"" & elif [ ! -z "$USE_DOCKER" ]; then docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./initial_event_test_slave_starter.sh $CLIENT_JSON_FILE $REMAINING_OPTIONS" & +elif [ ! -z "$JENKINS" ]; then + ssh -tt -i $PRV_KEY -o StrictHostKeyChecking=no jenkins@$IP_SLAVE "bash -ci \"set -m; cd $WS_ROOT/build/test; ./initial_event_test_slave_starter.sh $CLIENT_JSON_FILE $REMAINING_OPTIONS\" >> $WS_ROOT/slave_test_output 2>&1" & else cat <<End-of-message ******************************************************************************* @@ -70,6 +72,8 @@ export VSOMEIP_APPLICATION_NAME=initial_event_test_service_three ./initial_event_test_service 3 $REMAINING_OPTIONS & PID_SERVICE_THREE=$! +sleep 3 + unset VSOMEIP_APPLICATION_NAME # Array for client pids @@ -125,9 +129,10 @@ kill $FIRST_PID wait $FIRST_PID || FAIL=$(($FAIL+1)) # shutdown the services -kill $PID_SERVICE_THREE -kill $PID_SERVICE_TWO -kill $PID_SERVICE_ONE +kill $PID_SERVICE_THREE $PID_SERVICE_TWO $PID_SERVICE_ONE +wait $PID_SERVICE_THREE $PID_SERVICE_TWO $PID_SERVICE_ONE + + sleep 1 echo "" |