From 2ec6ea43f2ddc6c00a030be6d04c00f0924277b7 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Sun, 29 Jun 2014 18:56:44 -0700
Subject: 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>
---
 tests/bugs/bug-877992.t | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'tests/bugs/bug-877992.t')

diff --git a/tests/bugs/bug-877992.t b/tests/bugs/bug-877992.t
index 932ecc77b86..979cbfd3fdc 100755
--- a/tests/bugs/bug-877992.t
+++ b/tests/bugs/bug-877992.t
@@ -23,21 +23,21 @@ function hooks_prep ()
 {
     local event=$1
     touch /tmp/pre.out /tmp/post.out
-    touch /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    touch /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
+    touch $GLUSTERD_WORKDIR/hooks/1/"$event"/pre/Spre.sh
+    touch $GLUSTERD_WORKDIR/hooks/1/"$event"/post/Spost.sh
 
-    printf "#! /bin/bash\necho "$event"Pre > /tmp/pre.out\n" > /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    printf "#! /bin/bash\necho "$event"Post > /tmp/post.out\n" > /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
-    chmod a+x /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    chmod a+x /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
+    printf "#! /bin/bash\necho "$event"Pre > /tmp/pre.out\n" > $GLUSTERD_WORKDIR/hooks/1/"$event"/pre/Spre.sh
+    printf "#! /bin/bash\necho "$event"Post > /tmp/post.out\n" > $GLUSTERD_WORKDIR/hooks/1/"$event"/post/Spost.sh
+    chmod a+x $GLUSTERD_WORKDIR/hooks/1/"$event"/pre/Spre.sh
+    chmod a+x $GLUSTERD_WORKDIR/hooks/1/"$event"/post/Spost.sh
 }
 
 function hooks_cleanup ()
 {
     local event=$1
     rm /tmp/pre.out /tmp/post.out
-    rm /var/lib/glusterd/hooks/1/"$event"/pre/Spre.sh
-    rm /var/lib/glusterd/hooks/1/"$event"/post/Spost.sh
+    rm $GLUSTERD_WORKDIR/hooks/1/"$event"/pre/Spre.sh
+    rm $GLUSTERD_WORKDIR/hooks/1/"$event"/post/Spost.sh
 }
 
 ## Verify volume is created and its hooks script ran
-- 
cgit