From 419c5e01d3b5b9b646e73c1d4ed7d30aeec6ca27 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Sun, 26 Dec 1999 22:57:23 +0000
Subject: zsh-workers/9159

---
 Test/07cond.ztst | 2 +-
 Test/Makefile.in | 4 ++--
 Test/ztst.zsh    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'Test')

diff --git a/Test/07cond.ztst b/Test/07cond.ztst
index e86d9139b..260e60b5e 100644
--- a/Test/07cond.ztst
+++ b/Test/07cond.ztst
@@ -84,7 +84,7 @@
   [[ -u modish && ! -u zerolength ]]
 0:-u cond
 
-  [[ -x $ZTST_testdir/ztst.zsh && ! -x zerolength ]]
+  [[ -x $ZTST_srcdir/ztst.zsh && ! -x zerolength ]]
 0:-x cond
 
   [[ -z $bar && -z '' && ! -z $foo ]]
diff --git a/Test/Makefile.in b/Test/Makefile.in
index b7622a1df..107b61f58 100644
--- a/Test/Makefile.in
+++ b/Test/Makefile.in
@@ -41,8 +41,8 @@ INSTALL         = @INSTALL@
 # ========== DEPENDENCIES FOR TESTING ==========
 
 check test:
-	for f in *.ztst; do \
-	  ../Src/zsh -f ztst.zsh $$f; \
+	for f in $(sdir)/*.ztst; do \
+	  ../Src/zsh -f $(sdir)/ztst.zsh $$f; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index 8ce94fca1..7e82f8a5b 100755
--- a/Test/ztst.zsh
+++ b/Test/ztst.zsh
@@ -43,6 +43,9 @@ ZTST_mainopts=(${(kv)options})
 ZTST_testdir=$PWD
 ZTST_testname=$1
 
+# The source directory is not necessarily the current directory
+ZTST_srcdir=${0%/*}
+
 : ${TMPPREFIX:=/tmp/zsh}
 # Temporary files for redirection inside tests.
 ZTST_in=${TMPPREFIX}.ztst.in.$$
-- 
cgit 1.4.1