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/bugs/bug-874498.t | |
| parent | f29da9bcc812e3d0711005ce86051d70c277a165 (diff) | |
| download | glusterfs-2ec6ea43f2ddc6c00a030be6d04c00f0924277b7.tar.gz glusterfs-2ec6ea43f2ddc6c00a030be6d04c00f0924277b7.tar.xz glusterfs-2ec6ea43f2ddc6c00a030be6d04c00f0924277b7.zip | |
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/bugs/bug-874498.t')
| -rw-r--r-- | tests/bugs/bug-874498.t | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bugs/bug-874498.t b/tests/bugs/bug-874498.t index 9337e6dc68..843698d2a6 100644 --- a/tests/bugs/bug-874498.t +++ b/tests/bugs/bug-874498.t @@ -14,7 +14,7 @@ TEST $CLI volume start $V0; TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0; B0_hiphenated=`echo $B0 | tr '/' '-'` -kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ; +kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ; echo "GLUSTER FILE SYSTEM" > $M0/FILE1 echo "GLUSTER FILE SYSTEM" > $M0/FILE2 |