X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Frun_app_test.ksh;h=65adf686db5dade0b48cf4d6e9a568ccae8a8951;hb=6d112571b27574ae857da7cb8dc8758ffee4ff60;hp=964a0805d99ddab4469e9fcf52679b88df17f702;hpb=3925774e739509bb51df2c81addb3ab742c1801f;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/run_app_test.ksh b/test/app_test/run_app_test.ksh
index 964a080..65adf68 100644
--- a/test/app_test/run_app_test.ksh
+++ b/test/app_test/run_app_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,14 +21,13 @@
 # ---------------------------------------------------------------------------------
 #	Mnemonic:	run_app_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.
+#				processes for some library validation on top of nng.
 #				It should be possible to clone the repo, switch to this directory
 #				and execute  'ksh run -B'  which will build RMr, make the sender and
 #				recevier then  run the basic test.
 #
 #				Example command line:
 #					ksh ./run_app_test.ksh		# default 20 messages at 2 msg/sec
-#					ksh ./run_app_test.ksh -N    # default but with nanomsg lib
 #					ksh ./run_app_test.ksh -d 100 -n 10000 # send 10k messages with 100ms delay between
 #
 #	Date:		22 April 2019
@@ -40,21 +39,17 @@
 # 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${si} $nmsg $delay
 	echo $? >/tmp/PID$$.src		# must communicate state back via file b/c asynch
 }
 
 function run_rcvr {
-	if (( $nano_receiver ))
+	if (( mt_receiver ))
 	then
-		./receiver_nano $nmsg
+		echo "<TEST> testing with mt-receiver" >&2
+		./mt_receiver${si} $nmsg
 	else
-		./receiver $nmsg
+		./receiver${si} $nmsg
 	fi
 	echo $? >/tmp/PID$$.rrc
 }
@@ -104,8 +99,6 @@ endKat
 nmsg=20						# total number of messages to be exchanged (-n value changes)
 							# need two sent to each receiver to ensure hairpin entries were removed (will fail if they were not)
 delay=500000				# 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=""					# -b sets so that build does not pull
@@ -113,6 +106,9 @@ verbose=0
 use_installed=0
 my_ip=$(snarf_ip)			# get an ip to insert into the route table
 keep=0
+mt_receiver=0				# -m sets in order to test with multi-threaded receive stuff
+force_make=0
+si=""						# -S sets to build and test SI versions
 
 
 while [[ $1 == -* ]]
@@ -123,17 +119,21 @@ do
 		-d)	delay=$2; shift;;
 		-k) keep=1;;
 		-i) use_installed=1;;
-		-N)	nano_sender=1
-			nano_receiver=1
-			;;
+		-M)	force_make=1;;
+		-m)	mt_receiver=1;;
 		-n)	nmsg=$2; shift;;
+		-N)	si="";;							# build and test NNG versions (off si)
+		-S)	si="_si";;						# build and test SI95 versions
 		-v)	verbose=1;;
 
 		*)	echo "unrecognised option: $1"
-			echo "usage: $0 [-B] [-d micor-sec-delay] [-i] [-k] [-N] [-n num-msgs]"
-			echo "  -B forces a rebuild which will use .build"
+			echo "usage: $0 [-B] [-d micor-sec-delay] [-i] [-k] [-M] [-m] [-n num-msgs] [-S]"
+			echo "  -B forces an RMR rebuild which will use .build"
 			echo "  -i causes the installd libraries (/usr/local) to be referenced; -B is ignored if supplied"
 			echo "  -k keeps the route table"
+			echo "  -M force make on test applications"
+			echo "  -m test with mt-receive mode"
+			echo "  -S build/test SI95 based binaries"
 			echo ""
 			echo "total number of messages must > 20 to correctly test hairpin loop removal"
 			exit 1
@@ -175,8 +175,8 @@ else
 	
 		if [[ ! -d $build_path ]]
 		then
-			echo "cannot find build in: $build_path"
-			echo "either create, and then build RMr, or set BUILD_PATH as an evironment var before running this"
+			echo "[FAIL] cannot find build in: $build_path"
+			echo "[FAIL] either create, and then build RMr, or set BUILD_PATH as an evironment var before running this"
 			exit 1
 		fi
 	fi
@@ -192,11 +192,11 @@ fi
 
 export RMR_SEED_RT=${RMR_SEED_RT:-./app_test.rt}		# allow easy testing with different rt
 
-if [[ ! -f ./sender ]]
+if (( force_make )) || [[ ! -f ./sender${si} || ! -f ./receiver${si} ]]
 then
-	if ! make >/dev/null 2>&1
+	if ! make -B 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