Code Review
/
ric-plt
/
lib
/
rmr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add option for xml coverage to pytest
[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
f6e16b4
..
d268fd3
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
#!/usr/bin/env ksh
-#
:vi
ts=4 sw=4 noet :
+#
vim:
ts=4 sw=4 noet :
#==================================================================================
#==================================================================================
-# Copyright (c) 2019 Nokia
-# Copyright (c) 2018-20
19
AT&T Intellectual Property.
+# Copyright (c) 2019
-2020
Nokia
+# Copyright (c) 2018-20
20
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.
#
# 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 ))
function run_sender {
export RMR_RTG_SVC=$(( 9991 + $1 ))
port=$(( 43080 + $1 ))
- ./sender $nmsg $delay 5:6 $port
+ ./sender
${si}
$nmsg $delay 5:6 $port
echo $? >/tmp/PID$$.$1.src # must communicate state back via file b/c asynch
}
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
port=4460
export RMR_RTG_SVC=9990
- ./receiver $(( nmsg * nsenders )) $port
+ ./receiver
${si}
$(( nmsg * nsenders )) $port
echo $? >/tmp/PID$$.rrc
}
echo $? >/tmp/PID$$.rrc
}
@@
-78,6
+78,7
@@
rebuild=0
nopull=""
verbose=0
nsenders=3 # this is sane, but -s allows it to be set up
nopull=""
verbose=0
nsenders=3 # this is sane, but -s allows it to be set up
+si=""
while [[ $1 == -* ]]
do
while [[ $1 == -* ]]
do
@@
-86,12
+87,16
@@
do
-b) rebuild=1; nopull="nopull";; # build without pulling
-d) delay=$2; shift;;
-n) nmsg=$2; shift;;
-b) rebuild=1; nopull="nopull";; # build without pulling
-d) delay=$2; shift;;
-n) nmsg=$2; shift;;
+ -N) si="";; # enable NNG tests (disable si)
-s) nsenders=$2; shift;;
-s) nsenders=$2; shift;;
+ -S) si="_si";; # enable SI95 tests
-v) verbose=1;;
*) echo "unrecognised option: $1"
-v) verbose=1;;
*) echo "unrecognised option: $1"
- echo "usage: $0 [-B] [-d micor-sec-delay] [-
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 " -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
exit 1
;;
esac
@@
-108,7
+113,7
@@
fi
if (( rebuild ))
then
set -e
if (( rebuild ))
then
set -e
-
ksh
./rebuild.ksh $nopull | read build_path
+
$SHELL
./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
set +e
else
build_path=${BUILD_PATH:-"../../.build"} # we prefer .build at the root level, but allow user option
@@
-123,20
+128,20
@@
fi
if [[ -d $build_path/lib64 ]]
then
if [[ -d $build_path/lib64 ]]
then
- export LD_LIBRARY_PATH=$build_path:$build_path/lib64
+ export LD_LIBRARY_PATH=$build_path:$build_path/lib64
:$LD_LIBRARY_PATH
else
else
- export LD_LIBRARY_PATH=$build_path:$build_path/lib
+ export LD_LIBRARY_PATH=$build_path:$build_path/lib
:$LD_LIBRARY_PATH
fi
export LIBRARY_PATH=$LD_LIBRARY_PATH
export RMR_SEED_RT=./rts.rt
set_rt # create the route table
fi
export LIBRARY_PATH=$LD_LIBRARY_PATH
export RMR_SEED_RT=./rts.rt
set_rt # create the route table
-if [[ ! -f ./sender ]]
+if [[ ! -f ./sender
${si} || ! -f ./receiver${si}
]]
then
then
- if ! make >/dev/null 2>&1
+ if ! make
./sender${si} ./receiver${si}
>/dev/null 2>&1
then
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
exit 1
fi
fi