summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test-prepare-merge-takeover.sh
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2016-10-14 16:54:57 +0200
committerMagnus Ahltorp <map@kth.se>2016-10-14 16:54:57 +0200
commitc8af4e40e0096f60a5cf5039be775ff002619c4d (patch)
treee059ba998a4624fa950c12e2ca369be30d92c61d /test/scripts/light-system-test-prepare-merge-takeover.sh
parentc1dfe32e2ba948e62535102ab6dbafa60c3c6eda (diff)
Test failing merge backup
Refactor tests
Diffstat (limited to 'test/scripts/light-system-test-prepare-merge-takeover.sh')
-rwxr-xr-xtest/scripts/light-system-test-prepare-merge-takeover.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh
index 5529805..c84a17e 100755
--- a/test/scripts/light-system-test-prepare-merge-takeover.sh
+++ b/test/scripts/light-system-test-prepare-merge-takeover.sh
@@ -5,7 +5,7 @@ set -o errexit
top_srcdir=$(cd $(dirname $0)/../..; pwd)
-. ${top_srcdir}/test/test.shvars
+. ${top_srcdir}/test/scripts/testutils.sh
mv mergedb mergedb-down
mv mergedb-secondary mergedb