diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-06-29 18:56:44 -0700 |
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-07 01:17:29 -0700 |
| commit | 2ec6ea43f2ddc6c00a030be6d04c00f0924277b7 (patch) | |
| tree | b2d98cd8c4760c1af44c8b6a70661fe5566ce6da /tests/include.rc | |
| parent | f29da9bcc812e3d0711005ce86051d70c277a165 (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
- 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: I2339a0d9275de5939ccad3e52b535598064a35e7
BUG: 1111774
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8246
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/include.rc')
| -rw-r--r-- | tests/include.rc | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/tests/include.rc b/tests/include.rc index 8919d0a663c..72c00588200 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -7,7 +7,20 @@ V0=${V0:=patchy}; # volume name to use in tests V1=${V1:=patchy1}; # volume name to use in tests B0=${B0:=/d/backends}; # top level of brick directories CC=cc -case `uname -s` in +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 + +case $OSTYPE in Linux) H0=${H0:=`hostname --fqdn`}; # hostname ;; @@ -15,6 +28,7 @@ Linux) H0=${H0:=`hostname`}; # hostname ;; esac + DEBUG=${DEBUG:=0} # turn on debugging? PROCESS_UP_TIMEOUT=20 @@ -293,8 +307,9 @@ function cleanup() ;; esac - - rm -rf /var/lib/glusterd/* $B0/* /etc/glusterd/*; + if [ -n "${GLUSTERD_WORKDIR}" ] ; then + rm -rf $GLUSTERD_WORKDIR/* $B0/* /etc/glusterd/*; + fi umount -l $M0 2>/dev/null || true; umount -l $M1 2>/dev/null || true; @@ -454,10 +469,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 |