Revert RTS to use unidirectional connection

[ric-plt/lib/rmr.git] / test / app_test / run_rts_test.ksh

diff --git a/test/app_test/run_rts_test.ksh b/test/app_test/run_rts_test.ksh
index b01613f..bb874f0 100644 (file)
--- a/test/app_test/run_rts_test.ksh
+++ b/test/app_test/run_rts_test.ksh
@@ -1,8 +1,8 @@
 #!/usr/bin/env ksh
-# :vi ts=4 sw=4 noet :
+# vim: ts=4 sw=4 noet :
 #==================================================================================
-#    Copyright (c) 2019 Nokia
-#    Copyright (c) 2018-2019 AT&T Intellectual Property.
+#    Copyright (c) 2019-2020 Nokia
+#    Copyright (c) 2018-2020 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.
@@ -21,7 +21,7 @@
 # ---------------------------------------------------------------------------------
 #      Mnemonic:       run_rts_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 test starts several senders and one receiver. All messages
 #                              go to the receiver and an ack is sent back to the sending process.
 #                              Each sender puts a tag into the message allowing it to verify that
@@ -42,12 +42,7 @@
 function run_sender {
        export RMR_RTG_SVC=$(( 9991 + $1 ))
        port=$((  43080 + $1 ))
-       if (( $nano_sender ))
-       then
-               ./sender_nano $nmsg $delay 5:6 $port    # 5:6 causes mtype 5 only which is what receiver acks
-       else
-               ./sender $nmsg $delay 5:6 $port
-       fi
+       ./sender${si} $nmsg $delay 5:6 $port
        echo $? >/tmp/PID$$.$1.src              # must communicate state back via file b/c asynch
 }
 
@@ -57,12 +52,7 @@ function run_rcvr {
 
        port=4460
        export RMR_RTG_SVC=9990
-       if (( $nano_receiver ))
-       then
-               ./receiver_nano $(( nmsg * nsenders ))  $port
-       else
-               ./receiver $(( nmsg * nsenders ))  $port
-       fi
+       ./receiver${si} $(( nmsg * nsenders ))  $port
        echo $? >/tmp/PID$$.rrc
 }
 
@@ -83,13 +73,12 @@ endKat
 
 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
 nsenders=3                                     # this is sane, but -s allows it to be set up
+si=""
 
 while [[ $1 == -* ]]
 do
@@ -97,16 +86,17 @@ do
                -B)     rebuild=1;;
                -b)     rebuild=1; nopull="nopull";;    # build without pulling
                -d)     delay=$2; shift;;
-               -N)     nano_sender=1
-                       nano_receiver=1
-                       ;;
                -n)     nmsg=$2; shift;;
+               -N) si="";;                                                     # enable NNG tests (disable si)
                -s)     nsenders=$2; shift;;
+               -S) si="_si";;                                          # enable SI95 tests
                -v)     verbose=1;;
 
                *)      echo "unrecognised option: $1"
-                       echo "usage: $0 [-B] [-d micor-sec-delay] [-N] [-n num-msgs] [-s nsenders]"
+                       echo "usage: $0 [-B] [-d micor-sec-delay] [-M] [-n num-msgs] [-s nsenders] [-S]"
                        echo "  -B forces a rebuild which will use .build"
+                       echo "  -M force test applications to be remade"
+                       echo "  -S build/test SI95 based binaries"
                        exit 1
                        ;;
        esac
@@ -147,11 +137,11 @@ export RMR_SEED_RT=./rts.rt
 
 set_rt                 # create the route table
 
-if [[ ! -f ./sender ]]
+if [[ ! -f ./sender${si} || ! -f ./receiver${si} ]]
 then
-       if ! make >/dev/null 2>&1
+       if ! make ./sender${si} ./receiver${si} >/dev/null 2>&1
        then
-               echo "[FAIL] cannot find sender binary, and cannot make it.... humm?"
+               echo "[FAIL] cannot find sender${si} and/or receiver${si} binary, and cannot make them.... humm?"
                exit 1
        fi
 fi