#
#
# patch "test/populate-branch.sh"
#  from [823c038cc43b9b8f9abf210f293b95bf8f437a2d]
#    to [49d88dde4d7e340ab47c4c61b22becf16fea6e49]
# 
# patch "test/run-tests.sh"
#  from [bcbaa9a0aa838283d0b123b828aa3bcb79ab4edd]
#    to [0d7abfea70d63ced232512edd0f578c7a65fd960]
#
============================================================
--- test/populate-branch.sh	823c038cc43b9b8f9abf210f293b95bf8f437a2d
+++ test/populate-branch.sh	49d88dde4d7e340ab47c4c61b22becf16fea6e49
@@ -10,7 +10,7 @@ if ! [ $count ]; then count=100; fi
 if ! [ $branch ]; then exit 1; fi
 if ! [ $count ]; then count=100; fi
 
-mtn="mtn --confdir=$TESTDIR/confdir --quiet"
+mtn="mtn --root=. --confdir=$TESTDIR/confdir --quiet"
 
 if ! [ -d $TESTDIR/confdir/keys ]
 then
============================================================
--- test/run-tests.sh	bcbaa9a0aa838283d0b123b828aa3bcb79ab4edd
+++ test/run-tests.sh	0d7abfea70d63ced232512edd0f578c7a65fd960
@@ -83,11 +83,11 @@ for test_name in $(ls $SRCDIR/test/); do
         cp databases/*.mtn ./
 
         # see if it works
-        cp $SRCDIR/test/usher.conf.head usher.conf
+        cp $SRCDIR/test/usher.conf.head usher.conf.full
         sed '/^local/ s,$, "--confdir" "'$TESTDIR/confdir'",' \
-            < $TEST_SRC/usher.conf >> usher.conf
+            < $TEST_SRC/usher.conf >> usher.conf.full
 
-        ../../usher usher.conf &
+        ../../usher usher.conf.full &
         USHER=$!
         sleep 1