summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2014-09-16 14:00:03 -0400
committerVijay Bellur <vbellur@redhat.com>2014-09-21 10:31:25 -0700
commit936cf82d93e1e5204fe375f5c1f472ed7917b165 (patch)
treeb2d515202b76912284f4f3cdb0e34432845d080c
parentab305c30c11d7e1711d7c2cf005dbb46a50bf643 (diff)
tests: regression, can't run `prove $t` in subdirsv3.6.0beta1
In various tests we already use the pattern: . $(dirname $0)/../include.rc to locate various .rc files. Use the same pattern we already use to also find the new env.rc Change-Id: Ib7878c3f7f6491fcec401e9adbaa696ace392fae BUG: 1142420 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/8753 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net> Tested-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/include.rc9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/include.rc b/tests/include.rc
index 9926c28..85d3ae3 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -11,7 +11,12 @@ DEBUG=${DEBUG:=0} # turn on debugging?
OSTYPE=$(uname -s)
-if [ ! -f ${PWD}/tests/env.rc ]; then
+ENV_RC=$(dirname $0)/../env.rc
+if [ ! -f $ENV_RC ]; then
+ ENV_RC=$(dirname $0)/../../env.rc
+fi
+
+if [ ! -f $ENV_RC ]; then
echo "Aborting."
echo
echo "env.rc not found"
@@ -20,7 +25,7 @@ if [ ! -f ${PWD}/tests/env.rc ]; then
echo
exit 1
fi
-. ${PWD}/tests/env.rc
+. $ENV_RC
PROCESS_UP_TIMEOUT=20
NFS_EXPORT_TIMEOUT=20