diff options
| author | Lutz Bichler <Lutz.Bichler@bmw.de> | 2020-02-12 13:04:15 +0100 |
|---|---|---|
| committer | Lutz Bichler <Lutz.Bichler@bmw.de> | 2020-02-12 13:04:15 +0100 |
| commit | 8371cdca9463a75220c4de92b47c8df9d3bbe346 (patch) | |
| tree | 16b4bf73c284b026b0ac032171110dafd1752196 /test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh | |
| parent | ee44d19e0a3773adcda3bace073c66e334a3e6a7 (diff) | |
| download | vSomeIP-8371cdca9463a75220c4de92b47c8df9d3bbe346.tar.gz | |
vsomeip 3.1.7.13.1.7.1
Diffstat (limited to 'test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh')
| -rwxr-xr-x | test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh b/test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh index 041abc4..b1dd78d 100755 --- a/test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh +++ b/test/payload_tests/external_local_payload_test_client_local_and_external_starter.sh @@ -75,10 +75,10 @@ wait $CLIENT_PID || ((FAIL+=1)) # to finish the test successfully if [ ! -z "$USE_LXC_TEST" ]; then echo "starting external local payload on slave LXC" - 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/test; ./external_local_payload_test_client_external_start.sh\"" & + 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; ./external_local_payload_test_client_external_start.sh\"" & echo "remote ssh job id: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name elptclaes $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./external_local_payload_test_client_external_start.sh" & + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./external_local_payload_test_client_external_start.sh" & else cat <<End-of-message ******************************************************************************* @@ -129,11 +129,6 @@ check_tcp_udp_sockets_are_open $SERIVCE_PID 2 # with a non-zero exit code wait $SERIVCE_PID || ((FAIL+=1)) -if [ ! -z "$USE_DOCKER" ]; then - docker wait elptclaes - docker rm elptclaes -fi - # Check if client and server both exited sucessfully and the service didnt't # have any open TCP/UDP sockets if [ $FAIL -eq 0 ] |