diff options
Diffstat (limited to 'test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh')
| -rwxr-xr-x | test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh b/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh index a9adfe0..75e948e 100755 --- a/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh +++ b/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh @@ -10,16 +10,17 @@ # the testcase simply executes this script. This script then runs the services # and checks that all exit successfully. -if [ $# -lt 1 ] +if [ $# -lt 2 ] then - echo "Please pass a json file to this script." - echo "For example: $0 subscribe_notify_one_test_diff_client_ids_diff_ports_master.json" + echo "Please pass a json file and event reliability type to this script." + echo "For example: $0 subscribe_notify_one_test_diff_client_ids_diff_ports_master_udp.json UDP" exit 1 fi # replace master with slave to be able display the correct json file to be used # with the slave script -MASTER_JSON_FILE=$1 +RELIABILITY_TYPE=$1 +MASTER_JSON_FILE=$2 CLIENT_JSON_FILE=${MASTER_JSON_FILE/master/slave} FAIL=0 @@ -27,30 +28,30 @@ FAIL=0 # Start the services export VSOMEIP_APPLICATION_NAME=subscribe_notify_one_test_service_one export VSOMEIP_CONFIGURATION=$MASTER_JSON_FILE -./subscribe_notify_one_test_service 1 & +./subscribe_notify_one_test_service 1 $RELIABILITY_TYPE & export VSOMEIP_APPLICATION_NAME=subscribe_notify_one_test_service_two export VSOMEIP_CONFIGURATION=$MASTER_JSON_FILE -./subscribe_notify_one_test_service 2 & +./subscribe_notify_one_test_service 2 $RELIABILITY_TYPE & export VSOMEIP_APPLICATION_NAME=subscribe_notify_one_test_service_three export VSOMEIP_CONFIGURATION=$MASTER_JSON_FILE -./subscribe_notify_one_test_service 3 & +./subscribe_notify_one_test_service 3 $RELIABILITY_TYPE & sleep 1 if [ ! -z "$USE_LXC_TEST" ]; then echo "starting subscribe_notify_one_test_slave_starter.sh on slave LXC with parameters $CLIENT_JSON_FILE" - 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; ./subscribe_notify_one_test_slave_starter.sh $CLIENT_JSON_FILE\"" & + 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; ./subscribe_notify_one_test_slave_starter.sh $RELIABILITY_TYPE $CLIENT_JSON_FILE\"" & echo "remote ssh job id: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./subscribe_notify_one_test_slave_starter.sh $CLIENT_JSON_FILE" & + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./subscribe_notify_one_test_slave_starter.sh $RELIABILITY_TYPE $CLIENT_JSON_FILE" & else cat <<End-of-message ******************************************************************************* ******************************************************************************* ** Please now run: -** subscribe_notify_one_test_slave_starter.sh $CLIENT_JSON_FILE +** subscribe_notify_one_test_slave_starter.sh $RELIABILITY_TYPE $CLIENT_JSON_FILE ** from an external host to successfully complete this test. ** ** You probably will need to adapt the 'unicast' settings in |