srcdir != builddir test errors

srcdir != builddir test errors

[Vin Shelton]

I build zsh under a different directory than the source directory, and
the tests can't be found under this configuration.  The following
diffs work for me, but YMMV.

  - vin

--- Test/Makefile.in	Thu Dec 16 01:02:35 1999
+++ /usr/local/src/zsh-19991226/Test/Makefile.in	Sun Dec 26 13:07:03 1999
@@ -41,8 +41,8 @@
 # ========== 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 ==========
--- Test/ztst.zsh	Tue Dec 21 21:21:40 1999
+++ /usr/local/src/zsh-19991226/Test/ztst.zsh	Sun Dec 26 13:46:15 1999
@@ -43,6 +43,9 @@
 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.$$
--- Test/07cond.ztst	Wed Dec 22 20:17:06 1999
+++ /usr/local/src/zsh-19991226/Test/07cond.ztst	Sun Dec 26 13:46:50 1999
@@ -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 ]]

Re: srcdir != builddir test errors

[Tanaka Akira]

In article <m2ln6h2zue.fsf@zion.ne.mediaone.net>,
  Vin Shelton <acs@alumni.princeton.edu> writes:

> I build zsh under a different directory than the source directory, and
> the tests can't be found under this configuration.  The following
> diffs work for me, but YMMV.

It didn't work for me.  Because ZTST_srcdir was relative path.

Index: ztst.zsh
===================================================================
RCS file: /projects/zsh/zsh/Test/ztst.zsh,v
retrieving revision 1.1.1.8
diff -u -r1.1.1.8 ztst.zsh
--- ztst.zsh	1999/12/26 22:57:23	1.1.1.8
+++ ztst.zsh	1999/12/28 20:05:18
@@ -45,6 +45,7 @@
 
 # The source directory is not necessarily the current directory
 ZTST_srcdir=${0%/*}
+[[ ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir"
 
 : ${TMPPREFIX:=/tmp/zsh}
 # Temporary files for redirection inside tests.
-- 
Tanaka Akira

Re: srcdir != builddir test errors

[Tanaka Akira]

In article <rsqk8lyaky9.fsf@crane.jaist.ac.jp>,
  Tanaka Akira <akr@jaist.ac.jp> writes:

> +[[ ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir"

Oops.

Index: Test/ztst.zsh
===================================================================
RCS file: /projects/zsh/zsh/Test/ztst.zsh,v
retrieving revision 1.1.1.9
diff -u -r1.1.1.9 ztst.zsh
--- Test/ztst.zsh	1999/12/28 20:08:51	1.1.1.9
+++ Test/ztst.zsh	1999/12/31 11:23:15
@@ -45,7 +45,7 @@
 
 # The source directory is not necessarily the current directory
 ZTST_srcdir=${0%/*}
-[[ ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir"
+[[ $ZTST_srcdir = /* ]] || ZTST_srcdir="$ZTST_testdir/$ZTST_srcdir"
 
 : ${TMPPREFIX:=/tmp/zsh}
 # Temporary files for redirection inside tests.
-- 
Tanaka Akira