diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-14 13:06:26 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-09-03 11:01:45 -0700 |
| commit | 025ae07850375cbf981ed335a4ddf702d54be6e3 (patch) | |
| tree | a119246764dc98f0d0c7fb87572cd1b01bc18684 /tests/include.rc | |
| parent | 845d6c76701a3de6a11b76b004176971411c714e (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
Backport from master branch - http://review.gluster.org/#/c/8246/
- Break-way from '/var/lib/glusterd' hard-coded previously,
instead rely on 'configure' value from 'localstatedir'
- Provide 's/lib/db' as default working directory for gluster
management daemon for BSD and Darwin based installations
- loff_t is really off_t on Darwin
- fix-off the warnings generated by clang on FreeBSD/Darwin
- Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all
platforms.
- Define proper environment for running tests, define correct PATH
and LD_LIBRARY_PATH when running tests, so that the desired version
of glusterfs is used, regardless where it is installed.
(Thanks to manu@netbsd.org for this additional work)
Change-Id: I06e684ac4c26d1e74c9daf76753403ad15f79276
BUG: 1130308
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8486
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/include.rc')
| -rw-r--r-- | tests/include.rc | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/tests/include.rc b/tests/include.rc index 30dea01d2a7..1beac4f8acd 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -9,6 +9,19 @@ B0=${B0:=/d/backends}; # top level of brick directories H0=${H0:=`hostname --fqdn`}; # hostname DEBUG=${DEBUG:=0} # turn on debugging? +OSTYPE=$(uname -s) + +if [ ! -f ${PWD}/tests/env.rc ]; then + echo "Aborting." + echo + echo "env.rc not found" + echo + echo "Please correct the problem and try again." + echo + exit 1 +fi +. ${PWD}/tests/env.rc + PROCESS_UP_TIMEOUT=20 NFS_EXPORT_TIMEOUT=20 CHILD_UP_TIMEOUT=20 @@ -222,10 +235,10 @@ function _TEST_IN_LOOP() function cleanup() { - killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true; + killall -15 glusterfs glusterfsd glusterd 2>/dev/null || true; # allow completion of signal handlers for SIGTERM before issue SIGKILL sleep 1 - killall -9 glusterfs glusterfsd glusterd 2>/dev/null || true; + killall -9 glusterfs glusterfsd glusterd 2>/dev/null || true; MOUNTPOINTS=`mount | grep "$B0/" | awk '{print $3}'` for m in $MOUNTPOINTS; @@ -253,13 +266,14 @@ function cleanup() losetup -d $l done + if [ -n "${GLUSTERD_WORKDIR}" ] ; then + rm -rf $GLUSTERD_WORKDIR/* $B0/* /etc/glusterd/*; + fi - rm -rf /var/lib/glusterd/* $B0/* /etc/glusterd/*; - - umount -l $M0 2>/dev/null || true; - umount -l $M1 2>/dev/null || true; - umount -l $N0 2>/dev/null || true; - umount -l $N1 2>/dev/null || true; + umount -l $M0 2>/dev/null || true; + umount -l $M1 2>/dev/null || true; + umount -l $N0 2>/dev/null || true; + umount -l $N1 2>/dev/null || true; } @@ -300,10 +314,9 @@ alias EXPECT_KEYWORD='_EXPECT_KEYWORD $LINENO' alias TEST_IN_LOOP='_TEST_IN_LOOP $LINENO' shopt -s expand_aliases -ostype=$(uname -s) -if [ x"$ostype" = x"Linux" ]; then +if [ x"$OSTYPE" = x"Linux" ]; then alias dd="dd status=none" -elif [ x"$ostype" = x"NetBSD" ]; then +elif [ x"$OSTYPE" = x"NetBSD" ]; then alias dd="dd msgfmt=quiet" fi # MacOS doesn't seem to support either option. Doing nothing at all is |