From c1dfe32e2ba948e62535102ab6dbafa60c3c6eda Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Thu, 13 Oct 2016 15:10:20 +0200
Subject: Make tests run independently from cwd

---
 test/scripts/light-system-test-prepare-merge-takeover.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'test/scripts/light-system-test-prepare-merge-takeover.sh')

diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh
index 3bb5ad2..5529805 100755
--- a/test/scripts/light-system-test-prepare-merge-takeover.sh
+++ b/test/scripts/light-system-test-prepare-merge-takeover.sh
@@ -3,14 +3,12 @@
 set -o nounset
 set -o errexit
 
-SOFTHSM=/usr/local/bin/softhsm2-util
-INSTDIR=../catlfish
-PREFIX=..
+top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
-. ./test.shvars
+. ${top_srcdir}/test/test.shvars
 
-mv ${INSTDIR}/tests/mergedb ${INSTDIR}/tests/mergedb-down
-mv ${INSTDIR}/tests/mergedb-secondary ${INSTDIR}/tests/mergedb
-mkdir ${INSTDIR}/tests/mergedb-secondary
-touch ${INSTDIR}/tests/mergedb-secondary/logorder
-printf 0 > ${INSTDIR}/tests/mergedb-secondary/verifiedsize
+mv mergedb mergedb-down
+mv mergedb-secondary mergedb
+mkdir mergedb-secondary
+touch mergedb-secondary/logorder
+printf 0 > mergedb-secondary/verifiedsize
-- 
cgit v1.1