X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_rr_test.ksh;h=473d117ef2ffa7c210e439a33cc638a09ae8051b;hb=6efa7aa73ef36cb0c299e34b5457ab0e4ebf88e3;hp=2e52aa6635ac1f3b98da5d56c29d1847e6f66879;hpb=a41c6f5f26b3a44009f4aff3df3f83b9a79ace01;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_rr_test.ksh b/test/app_test/run_rr_test.ksh
index 2e52aa6..473d117 100644
--- a/test/app_test/run_rr_test.ksh
+++ b/test/app_test/run_rr_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 nano/nng. This
 #				particular tests starts several receivers and creates a route table
 #				which causes messages to be sent round robin to all of the receivers.
 #				The number of messages command line parameter (-n) will be the number
@@ -46,9 +46,9 @@ function run_sender {
 	export RMR_RTG_SVC=8990
 	if (( $nano_sender ))
 	then
-		./sender_nano $(( nmsg * nrcvrs )) $delay 1
+		./sender_nano $(( nmsg * nrcvrs )) $delay $max_mtype
 	else
-		./sender $(( nmsg * nrcvrs ))  $delay 1
+		./sender $(( nmsg * nrcvrs ))  $delay $max_mtype
 	fi
 	echo $? >/tmp/PID$$.src		# must communicate state back via file b/c asynch
 }
@@ -85,15 +85,15 @@ function set_rt {
 		rte |0 | $endpoints  |0
 		rte |1 | $endpoints  |10
 		mse |2 | 20 | $endpoints		# new style mtype/subid entry
-		rte |3 | $endpoints  |0
-		rte |4 | $endpoints  |0
-		rte |5 | $endpoints  |0
-		rte |6 | $endpoints  |0
-		rte |7 | $endpoints  |0
-		rte |8 | $endpoints  |0
-		rte |9 | $endpoints  |0
-		rte |10 | $endpoints  |0
-		rte |11 | $endpoints  |0
+		rte |3 | $endpoints  | -1
+		rte |4 | $endpoints  | -1
+		rte |5 | $endpoints  | -1
+		rte |6 | $endpoints  | -1
+		rte |7 | $endpoints  | -1
+		rte |8 | $endpoints  | -1
+		rte |9 | $endpoints  | -1
+		rte |10 | $endpoints  | -1
+		rte |11 | $endpoints  | -1
 		newrt |end
 endKat
 
@@ -113,14 +113,18 @@ nano_sender=0				# start nano version if set (-N)
 nano_receiver=0
 wait=1
 rebuild=0
+nopull=""
 verbose=0
+max_mtype=1					# causes all msgs to go with type 1; use -M to set up, but likely harder to validate
 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";;		# build without pulling
 		-d)	delay=$2; shift;;
+		-m) max_mtype=$2; shift;;
 		-N)	nano_sender=1
 			nano_receiver=1
 			;;
@@ -138,18 +142,16 @@ do
 	shift
 done
 
-
 if (( verbose ))
 then
 	echo "2" >.verbose
 	export RMR_VCTL_FILE=".verbose"
 fi
 
-if (( rebuild )) 
+if (( rebuild ))
 then
-	build_path=../../.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
@@ -162,7 +164,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=./rr.rt