X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_rts_test.sh;h=86c54fa65b502d6be09b533b40574810e34daf3c;hb=e2c0690497a2db5659b3e138e4e106d70fee4aab;hp=7ebf4b467fb11c28c6b9e0ce8a54af47e706fbb6;hpb=ca366b18fa2887300361abc2539f23c068601598;p=ric-plt%2Flib%2Frmr.git diff --git a/test/app_test/run_rts_test.sh b/test/app_test/run_rts_test.sh index 7ebf4b4..86c54fa 100644 --- a/test/app_test/run_rts_test.sh +++ b/test/app_test/run_rts_test.sh @@ -1,8 +1,8 @@ #!/usr/bin/env ksh # vim: ts=4 sw=4 noet : #================================================================================== -# Copyright (c) 2019-2020 Nokia -# Copyright (c) 2018-2020 AT&T Intellectual Property. +# Copyright (c) 2019-2021 Nokia +# Copyright (c) 2018-2021 AT&T Intellectual Property. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ function run_sender { export RMR_RTG_SVC=$(( 9991 + $1 )) port=$(( 43080 + $1 )) - ./sender${si} $nmsg $delay 5:6 $port + ./sender $nmsg $delay 5:6 $port echo $? >/tmp/PID$$.$1.src # must communicate state back via file b/c asynch } @@ -52,7 +52,7 @@ function run_rcvr { port=4460 export RMR_RTG_SVC=9990 - ./receiver${si} $(( nmsg * nsenders )) $port + ./receiver $(( nmsg * nsenders )) $port echo $? >/tmp/PID$$.rrc } @@ -63,7 +63,7 @@ function run_rcvr { function set_rt { cat <rts.rt newrt | start - mse |5 | -1 | localhost:4460 + mse |5 | -1 | 127.0.0.1:4460 newrt | end endKat @@ -87,9 +87,9 @@ do -b) rebuild=1; nopull="nopull";; # build without pulling -d) delay=$2; shift;; -n) nmsg=$2; shift;; - -N) si="";; # enable NNG tests (disable si) + -N) ;; # ignored for back compat -- nng no longer supported -s) nsenders=$2; shift;; - -S) si="_si";; # enable SI95 tests + -S) ;; # ignored for back compat -- si is only supported transport -v) verbose=1;; *) echo "unrecognised option: $1" @@ -141,11 +141,11 @@ export RMR_SEED_RT=./rts.rt set_rt # create the route table -if [[ ! -f ./sender${si} || ! -f ./receiver${si} ]] +if [[ ! -f ./sender || ! -f ./receiver ]] then - if ! make ./sender${si} ./receiver${si} >/dev/null 2>&1 + if ! make ./sender ./receiver >/dev/null 2>&1 then - echo "[FAIL] cannot find sender${si} and/or receiver${si} binary, and cannot make them.... humm?" + echo "[FAIL] cannot find sender and/or receiver binary, and cannot make them.... humm?" exit 1 fi fi