about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-04-21 10:37:36 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-04-21 10:37:36 +0000
commit74eaa20404143884705227cb82141f9eb1243c60 (patch)
tree7351f15aad5696590319ed9d53e2fca0d68eb8c6
parent2528c3b513f9af47ff91865db6f7e58f2fc18e21 (diff)
downloadzsh-74eaa20404143884705227cb82141f9eb1243c60.tar.gz
zsh-74eaa20404143884705227cb82141f9eb1243c60.tar.xz
zsh-74eaa20404143884705227cb82141f9eb1243c60.zip
26858: use zsh instead of sh in exec -l test
-rw-r--r--ChangeLog5
-rw-r--r--Test/A01grammar.ztst4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 87c24c8ba..0aa1b546d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-21  Peter Stephenson  <pws@csr.com>
 
+	* 26858: Test/A01grammar.ztst: use zsh -fc instead of /bin/sh -c
+	for testing exec -l to avoid sensitivity to /etc/profile.
+
 	* 26853 + typo fix: NEWS, README, Etc/CONTRIBUTORS, Etc/FAQ.yo,
 	Etc/relnote_4.3.10.txt: package documentation updates.
 
@@ -11588,5 +11591,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4659 $
+* $Revision: 1.4660 $
 *****************************************************
diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst
index a1ec2cc00..9d9f49860 100644
--- a/Test/A01grammar.ztst
+++ b/Test/A01grammar.ztst
@@ -62,9 +62,9 @@
   (exec /bin/sh; echo bar)
 0:`exec' precommand modifier
 
-  (exec -l /bin/sh -c 'echo $0')
+  (exec -l $ZTST_testdir/../Src/zsh -fc 'echo $0' | sed 's%/.*/%%' )
 0:`exec' with -l option
->-/bin/sh
+>-zsh
 
   (exec -a /bin/SPLATTER /bin/sh -c 'echo $0')
 0:`exec' with -a option