X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fapp_test%2Frun_multi_test.ksh;h=4e1a7a3491164c42fbf787db18aa34f01d055ca5;hb=2596b2305f214efbd7aba832fa009217ab854770;hp=9bfc59b6c87f2394a9fe67b22f007a84db79fc0a;hpb=a41c6f5f26b3a44009f4aff3df3f83b9a79ace01;p=ric-plt%2Flib%2Frmr.git diff --git a/test/app_test/run_multi_test.ksh b/test/app_test/run_multi_test.ksh index 9bfc59b..4e1a7a3 100644 --- a/test/app_test/run_multi_test.ksh +++ b/test/app_test/run_multi_test.ksh @@ -21,7 +21,7 @@ # --------------------------------------------------------------------------------- # Mnemonic: run_multi_test.ksh # Abstract: This is a simple script to set up and run the basic send/receive -# processes for some library validation on top of nano/nng. This +# processes for some library validation on top of nng. This # particular tests starts several receivers and creates a route table # which causes messages to be sent to all receivers in parallel # (forcing message cloning internally in RMr). @@ -31,7 +31,6 @@ # # Example command line: # ksh ./run_multi_test.ksh # default 10 messages at 1 msg/sec -# ksh ./run_multi_test.ksh -N # default but with nanomsg lib # ksh ./run_multi_test.ksh -d 100 -n 10000 # send 10k messages with 100ms delay between # # Date: 24 April 2019 @@ -43,12 +42,7 @@ # file in order for the 'main' to pick them up easily. # function run_sender { - if (( $nano_sender )) - then - ./sender_nano $nmsg $delay - else - ./sender $nmsg $delay - fi + ./sender $nmsg $delay echo $? >/tmp/PID$$.src # must communicate state back via file b/c asynch } @@ -58,12 +52,7 @@ function run_rcvr { port=$(( 4460 + ${1:-0} )) export RMR_RTG_SVC=$(( 9990 + $1 )) - if (( $nano_receiver )) - then - ./receiver_nano $nmsg $port - else - ./receiver $nmsg $port - fi + ./receiver $nmsg $port echo $? >/tmp/PID$$.$1.rrc } @@ -83,8 +72,8 @@ function set_rt { mse |0 | 0 | $groups mse |1 | 10 | $groups mse |2 | 20 | $groups - rte |3 | $groups - rte |4 | $groups + rte |3 | $groups + rte |4 | $groups rte |5 | $groups rte |6 | $groups rte |7 | $groups @@ -107,28 +96,25 @@ fi nmsg=10 # total number of messages to be exchanged (-n value changes) delay=1000000 # microsec sleep between msg 1,000,000 == 1s -nano_sender=0 # start nano version if set (-N) -nano_receiver=0 wait=1 rebuild=0 +nopull="" verbose=0 nrcvrs=3 # this is sane, but -r allows it to be set up while [[ $1 == -* ]] do - case $1 in + case $1 in -B) rebuild=1;; + -b) rebuild=1; nopull="nopull";; # enable build but without pull -d) delay=$2; shift;; - -N) nano_sender=1 - nano_receiver=1 - ;; -n) nmsg=$2; shift;; -r) nrcvrs=$2; shift;; -v) verbose=1;; *) echo "unrecognised option: $1" - echo "usage: $0 [-B] [-d micor-sec-delay] [-N] [-n num-msgs]" - echo " -B forces a rebuild which will use .build" + echo "usage: $0 [-B] [-d micor-sec-delay] [-n num-msgs]" + echo " -B forces an RMR rebuild which will use .build" exit 1 ;; esac @@ -142,11 +128,10 @@ then export RMR_VCTL_FILE=".verbose" fi -if (( rebuild )) +if (( rebuild )) then - build_path=../../.build # if we rebuild we can insist that it is in .build :) set -e - ksh ./rebuild.ksh + ksh ./rebuild.ksh $nopull | read build_path set +e else build_path=${BUILD_PATH:-"../../.build"} # we prefer .build at the root level, but allow user option @@ -159,7 +144,12 @@ else fi fi -export LD_LIBRARY_PATH=$build_path:$build_path/lib +if [[ -d $build_path/lib64 ]] +then + export LD_LIBRARY_PATH=$build_path:$build_path/lib64 +else + export LD_LIBRARY_PATH=$build_path:$build_path/lib +fi export LIBRARY_PATH=$LD_LIBRARY_PATH export RMR_SEED_RT=./multi.rt