diff options
author | Micael Karlberg <[email protected]> | 2019-05-29 13:50:12 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2019-05-29 13:50:12 +0200 |
commit | 5ef7039261b8af01d97ba22ea05d5a466423c256 (patch) | |
tree | 0fc34371f5143f0c340b2268d5dad7ec06855564 /erts/emulator/test/esock_ttest/esock-ttest-client | |
parent | 00f497b18202d4b1b97fbdd0dcf211a6066227a9 (diff) | |
parent | 0bb7928c5985b057efbf8846ffbfc55edc7f31d4 (diff) | |
download | otp-5ef7039261b8af01d97ba22ea05d5a466423c256.tar.gz otp-5ef7039261b8af01d97ba22ea05d5a466423c256.tar.bz2 otp-5ef7039261b8af01d97ba22ea05d5a466423c256.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test/esock_ttest/esock-ttest-client')
-rwxr-xr-x | erts/emulator/test/esock_ttest/esock-ttest-client | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-client b/erts/emulator/test/esock_ttest/esock-ttest-client index 1ab56f2d44..7c90ae6391 100755 --- a/erts/emulator/test/esock_ttest/esock-ttest-client +++ b/erts/emulator/test/esock_ttest/esock-ttest-client @@ -26,33 +26,46 @@ ESOCK_TTEST=$EMU_TEST/esock_ttest RUNTIME=30 -MSGID=$1 -SERVER_ADDR=$2 -SERVER_PORT=$3 +if [ $# = 3 ]; then + MSGID=$1 + SERVER_INFO=$2:$3 + + ITERATIONS="\ + gen false $MSGID + gen true $MSGID + gen once $MSGID + sock false $MSGID + sock true $MSGID + sock once $MSGID" + +else + if [ $# = 2 ]; then + MSGID=$1 + SERVER_INFO=$2 + + ITERATIONS="\ + sock false $MSGID + sock true $MSGID + sock once $MSGID" + + else + echo "Invalid number of args" + exit 1; + fi +fi + # --------------------------------------------------------------------------- -ITERATIONS="\ - gen false $MSGID - gen true $MSGID - gen once $MSGID - sock false $MSGID - sock true $MSGID - sock once $MSGID" - -# gen false 2 -# gen true 2 -# gen once 2 -# sock false 2 -# sock true 2 -# sock once 2 -# gen false 3 -# gen true 3 -# gen once 3 -# sock false 3 -# sock true 3 -# sock once 3 -# +# For when we have figured out how to configure local for gen_tcp... + +#ITERATIONS="\ +# gen false $MSGID +# gen true $MSGID +# gen once $MSGID +# sock false $MSGID +# sock true $MSGID +# sock once $MSGID" # --------------------------------------------------------------------------- @@ -64,7 +77,7 @@ echo "$ITERATIONS" | # The /dev/null at the end is necessary because erlang "does things" with stdin # and this case would cause the 'while read' to "fail" so that we only would # loop one time - $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_ADDR:$SERVER_PORT --runtime $RUNTIME </dev/null + $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_INFO --runtime $RUNTIME </dev/null echo "" done |