#
#
# patch "Makefile.am"
#  from [d57d9f1898a678ceadb927e18d45ff4e090022c6]
#    to [8cc7674ddf7aa3c512d10a5fe22da5bae32ec73e]
# 
# patch "test/run-tests.sh"
#  from [608db7ff9813f466ec31e7307b0b13797f00a685]
#    to [5999d6d9d8ef5fa21c06d9aa0979eef3c18c1958]
#
============================================================
--- Makefile.am	d57d9f1898a678ceadb927e18d45ff4e090022c6
+++ Makefile.am	8cc7674ddf7aa3c512d10a5fe22da5bae32ec73e
@@ -22,10 +22,8 @@ mostlyclean-local:
 EXTRA_DIST = ChangeLog.txt test
 
 mostlyclean-local:
-	rm -rf test/confdir test/status test/test*/databases \
-		test/test*/*.mtn test/test*/*.mtn-journal \
-		test/test*/server-logs \
-		test/test*/testlog.log test/test*/usher.conf.full
+	rm -rf test-dir
 
+distcleancheck_listfiles = find . -type f -a ! -name ChangeLog.txt -print
 ChangeLog.txt:
 	$(srcdir)/ChangeLog > $@
============================================================
--- test/run-tests.sh	608db7ff9813f466ec31e7307b0b13797f00a685
+++ test/run-tests.sh	5999d6d9d8ef5fa21c06d9aa0979eef3c18c1958
@@ -17,9 +17,10 @@ populate() {
     fi
 }
 
-mkdir -p test && cd test
+mkdir -p test-dir && cd test-dir
 TESTDIR=$(pwd)
 export TESTDIR
+echo TESTDIR=$TESTDIR
 rm -f $TESTDIR/status
 
 mkdir -p confdir