Set up scratch directory for tests.

diff --git a/.cvsignore b/.cvsignore
index 86b08b5..7e45f31 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,4 +5,5 @@ config.h
 config.log
 config.status
 rsync
 config.log
 config.status
 rsync

+testdir

 zlib/dummy
 zlib/dummy

diff --git a/Makefile.in b/Makefile.in
index ee6b5c4..7e3df79 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,4 +92,4 @@ finddead:
 test: check
 
 check:
 test: check
 
 check:

-       rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/testsuite/master.test
+       rsync_bin=`pwd`/rsync srcdir="$(srcdir)" testdir=`pwd`/testdir $(srcdir)/testsuite/master.test

diff --git a/testsuite/master.test b/testsuite/master.test
index 4f9f286..2260386 100755 (executable)
--- a/testsuite/master.test
+++ b/testsuite/master.test
@@ -17,16 +17,27 @@
 # build scripts.  It might be relative, so we need to make it
 # absolute.
 
 # build scripts.  It might be relative, so we need to make it
 # absolute.
 

+# testdir is a scratch directory for holding temporary test files.
+

 # The pwd is undefined when this script starts.
 
 # The pwd is undefined when this script starts.
 

+set -e
+
+if ! [ -d "$testdir" ] && ! mkdir "$testdir"
+then
+    echo "warning: testdir $testdir is not a directory!" >&2
+    exit 1
+fi
+
+testdir=`cd $testdir && pwd`
+

 srcdir=`cd $srcdir && pwd`
 
 echo "============================================================"
 echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 srcdir=`cd $srcdir && pwd`
 
 echo "============================================================"
 echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"

-
-set -e
+echo "    testdir=$testdir"

 
 test_names="rsync-hello hands"
 
 
 test_names="rsync-hello hands"