Some flavours of Linux default to installing libraries
in lib64 rather than using lib as the default hardware
type and libXX as alternate architecture formats. These
changes allow the application oriented test scripts to
find the RMr libraries in the build directory regardless
of the choice of the underlying system.
Change-Id: I74aa982d7934f9c7dc7a5e86bbd1fa678c8dec61
Signed-off-by: E. Scott Daniels <daniels@research.att.com>
.EXPORT_ALL_VARIABLES:
.ONESHELL:
.EXPORT_ALL_VARIABLES:
.ONESHELL:
+#.SHELLFLAGS = -e # hosed on some flavours so keep it off
SHELL = /bin/ksh
build_path ?= ../../.build
SHELL = /bin/ksh
build_path ?= ../../.build
# ---------------------------------------------------------------------------------
# Mnemonic: rebuild.ksh
# ---------------------------------------------------------------------------------
# Mnemonic: rebuild.ksh
-# Abstract: This is a simple script that will cause RMr to be rebuilt. It
+# Abstract: This is a simple script that will cause RMr to be rebuilt. It
# may be invoked by any of the run_* scripts in this directory.
#
# Date: 24 April 2019
# may be invoked by any of the run_* scripts in this directory.
#
# Date: 24 April 2019
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
export RMR_VCTL_FILE=".verbose"
fi
export RMR_VCTL_FILE=".verbose"
fi
then
build_path=../../.build
set -e
then
build_path=../../.build
set -e
-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
# ---------------------------------------------------------------------------------
# Mnemonic: run_multi_test.ksh
# Abstract: This is a simple script to set up and run the basic send/receive
# ---------------------------------------------------------------------------------
# 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 to all receivers in parallel
# (forcing message cloning internally in RMr).
# particular tests starts several receivers and creates a route table
# which causes messages to be sent to all receivers in parallel
# (forcing message cloning internally in RMr).
mse |0 | 0 | $groups
mse |1 | 10 | $groups
mse |2 | 20 | $groups
mse |0 | 0 | $groups
mse |1 | 10 | $groups
mse |2 | 20 | $groups
- rte |3 | $groups
- rte |4 | $groups
+ rte |3 | $groups
+ rte |4 | $groups
rte |5 | $groups
rte |6 | $groups
rte |7 | $groups
rte |5 | $groups
rte |6 | $groups
rte |7 | $groups
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
export RMR_VCTL_FILE=".verbose"
fi
export RMR_VCTL_FILE=".verbose"
fi
then
build_path=../../.build # if we rebuild we can insist that it is in .build :)
set -e
then
build_path=../../.build # if we rebuild we can insist that it is in .build :)
set -e
-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=./multi.rt
export LIBRARY_PATH=$LD_LIBRARY_PATH
export RMR_SEED_RT=./multi.rt
# ---------------------------------------------------------------------------------
# Mnemonic: run_multi_test.ksh
# Abstract: This is a simple script to set up and run the basic send/receive
# ---------------------------------------------------------------------------------
# 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
# 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
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
-B) rebuild=1;;
-d) delay=$2; shift;;
-N) nano_sender=1
export RMR_VCTL_FILE=".verbose"
fi
export RMR_VCTL_FILE=".verbose"
fi
then
build_path=../../.build
set -e
then
build_path=../../.build
set -e
-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
export LIBRARY_PATH=$LD_LIBRARY_PATH
export RMR_SEED_RT=./rr.rt