diff options
author | Tanaka Akira <akr@users.sourceforge.net> | 1999-12-26 22:57:23 +0000 |
---|---|---|
committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-12-26 22:57:23 +0000 |
commit | 419c5e01d3b5b9b646e73c1d4ed7d30aeec6ca27 (patch) | |
tree | e91a73d149ee8ad01203919c54d9390be6a41418 | |
parent | c116c3ddbd3768b6c881818335d7e0eb3ab449cd (diff) | |
download | zsh-419c5e01d3b5b9b646e73c1d4ed7d30aeec6ca27.tar.gz zsh-419c5e01d3b5b9b646e73c1d4ed7d30aeec6ca27.tar.xz zsh-419c5e01d3b5b9b646e73c1d4ed7d30aeec6ca27.zip |
zsh-workers/9159
-rw-r--r-- | Test/07cond.ztst | 2 | ||||
-rw-r--r-- | Test/Makefile.in | 4 | ||||
-rwxr-xr-x | Test/ztst.zsh | 3 |
3 files changed, 6 insertions, 3 deletions
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.$$ |