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
enhance(API): Add source IP support to msg header
[ric-plt/lib/rmr.git]
/
test
/
app_test
/
run_app_test.ksh
diff --git
a/test/app_test/run_app_test.ksh
b/test/app_test/run_app_test.ksh
index
3c4f20e
..
ff0673f
100644
(file)
--- a/
test/app_test/run_app_test.ksh
+++ b/
test/app_test/run_app_test.ksh
@@
-73,12
+73,14
@@
nano_sender=0 # start nano version if set (-N)
nano_receiver=0
wait=1
rebuild=0
nano_receiver=0
wait=1
rebuild=0
+nopull="" # -b sets so that build does not pull
verbose=0
while [[ $1 == -* ]]
do
verbose=0
while [[ $1 == -* ]]
do
- case $1 in
- -B) rebuild=1;;
+ case $1 in
+ -B) rebuild=1;; # build with pull first
+ -b) rebuild=1; nopull="nopull";; # buld without pull
-d) delay=$2; shift;;
-N) nano_sender=1
nano_receiver=1
-d) delay=$2; shift;;
-N) nano_sender=1
nano_receiver=1
@@
-102,11
+104,10
@@
then
export RMR_VCTL_FILE=".verbose"
fi
export RMR_VCTL_FILE=".verbose"
fi
-if (( rebuild ))
+if (( rebuild ))
then
then
- build_path=../../.build
set -e
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
set +e
else
build_path=${BUILD_PATH:-"../../.build"} # we prefer .build at the root level, but allow user option
@@
-119,7
+120,13
@@
else
fi
fi
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=${RMR_SEED_RT:-./local.rt} # allow easy testing with different rt
export LIBRARY_PATH=$LD_LIBRARY_PATH
export RMR_SEED_RT=${RMR_SEED_RT:-./local.rt} # allow easy testing with different rt