summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-07-04 00:45:07 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-07-04 00:45:07 +0000
commit715278d0631c1a165d2b9aae8e3650e1d7c2ad02 (patch)
tree2cec0792a6ed0a184bda0bde20c7c3f74ad4cfd3
parentc5e47b85366310d4b81a39335a60769ba4f5b2eb (diff)
downloadzsh-715278d0631c1a165d2b9aae8e3650e1d7c2ad02.tar.gz
zsh-715278d0631c1a165d2b9aae8e3650e1d7c2ad02.tar.xz
zsh-715278d0631c1a165d2b9aae8e3650e1d7c2ad02.zip
12151: Fix ZDOTDIR during "make check" for static builds.
-rw-r--r--ChangeLog3
-rw-r--r--Test/Makefile.in2
-rw-r--r--Test/comptest2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ffde2a7f..df8d147fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 
 2000-07-03  Bart Schaefer  <schaefer@zsh.org>
 
+	* 12151: Test/Makefile.in, Test/comptest: Point ZDOTDIR into the
+	Test directory itself, and clean up .zcompdump after testing.
+
 	* 12148: Completion/Core/_path_files: Followup to 12133 as
 	suggested by Sven in 12137: Don't merge display-ordering glob
 	flags into the parens in $(...) expressions.
diff --git a/Test/Makefile.in b/Test/Makefile.in
index 3c865b7ad..417ed0774 100644
--- a/Test/Makefile.in
+++ b/Test/Makefile.in
@@ -48,7 +48,7 @@ check test:
 	for f in $(sdir)/$(TESTNUM)*.ztst; do \
 	  $(dir_top)/Src/zsh -f $(sdir)/ztst.zsh $$f; \
 	done
-	rm -rf Modules
+	rm -rf Modules .zcompdump
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
diff --git a/Test/comptest b/Test/comptest
index d486bef5f..cb0e06f57 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -24,7 +24,7 @@ comptestinit () {
   }
 
   comptesteval \
-"export ZDOTDIR=$ZTST_testdir/Modules" \
+"export ZDOTDIR=$ZTST_testdir" \
 "module_path=( $module_path )" \
 "fpath=( $fpath )" \
 'LISTMAX=10000000