From 4df7868d39f4f6c5708dc2fd15af7dcd5a9cbae1 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Fri, 17 Aug 2001 01:34:31 +0000
Subject: [PATCH] Try to fix "make check" directory path.

Don't wait for input at end of tests.
---
 Makefile.in                |  3 +--
 testsuite/master.test      | 25 ++++++++++++++++++++++---
 testsuite/rsync-hello.test |  2 ++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 15e788eb..ee6b5c41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,6 @@ srcdir=@srcdir@
 VPATH=$(srcdir)
 SHELL=/bin/sh
 
-
 .SUFFIXES:
 .SUFFIXES: .c .o
 
@@ -93,4 +92,4 @@ finddead:
 test: check
 
 check:
-	rsync_bin=`pwd`/rsync testdir=$(srcdir)/testsuite $(srcdir)/testsuite/master.test
+	rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/testsuite/master.test
diff --git a/testsuite/master.test b/testsuite/master.test
index 5356d22c..4f9f2866 100755
--- a/testsuite/master.test
+++ b/testsuite/master.test
@@ -8,8 +8,25 @@
 
 # We need a few environment variables to know what to test.
 
+# rsync_bin gives the location of the rsync binary.  This is either
+# builddir/rsync if we're testing an uninstalled copy, or
+# install_prefix/bin/rsync if we're testing an installed copy.  On the
+# build farm rsync will be installed, but into a scratch /usr.
+
+# srcdir gives the location of the source tree, which lets us find the
+# build scripts.  It might be relative, so we need to make it
+# absolute.
+
+# The pwd is undefined when this script starts.
+
+srcdir=`cd $srcdir && pwd`
+
 echo "============================================================"
-echo "$0 running"
+echo "$0 running in `pwd`"
+echo "    rsync_bin=$rsync_bin"
+echo "    srcdir=$srcdir"
+
+set -e
 
 test_names="rsync-hello hands"
 
@@ -21,11 +38,13 @@ missing=0
 passed=0
 failed=0
 
-testsrcdir="`pwd`"
+suitedir="$srcdir/testsuite"
+cd "$suitedir"
+echo "    suitedir=$suitedir"
 
 for testbase in $test_names
 do
-    testscript="$testsrcdir/$testbase.test"
+    testscript="./$testbase.test"
     if test \! -f "$testscript" 
     then
 	echo "$testscript does not exist" >&2
diff --git a/testsuite/rsync-hello.test b/testsuite/rsync-hello.test
index a925668d..2aacc288 100755
--- a/testsuite/rsync-hello.test
+++ b/testsuite/rsync-hello.test
@@ -1,3 +1,5 @@
 #! /bin/sh
 
+echo $0 running
+
 "$rsync_bin" --version || exit 1
-- 
2.34.1