summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2005-05-01 01:23:54 +0000
committerBart Schaefer <barts@users.sourceforge.net>2005-05-01 01:23:54 +0000
commit5ade42c05eaef75d6df17780f6d213192cdcd8df (patch)
tree07bb908eec8d5540e0e9e067572571d49de8ed68
parent2c208c7743e240d155b2650f74c374ecab08644f (diff)
downloadzsh-5ade42c05eaef75d6df17780f6d213192cdcd8df.tar.gz
zsh-5ade42c05eaef75d6df17780f6d213192cdcd8df.tar.xz
zsh-5ade42c05eaef75d6df17780f6d213192cdcd8df.zip
21215: clean up after autoloaded trap test
-rw-r--r--ChangeLog5
-rw-r--r--Test/C03traps.ztst8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1efbeaa52..4cfde598b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-30  Bart Schaefer  <schaefer@zsh.org>
+
+	* 21215: Test/C03traps.ztst: clean up TRAPEXIT file left behind by
+	autoloaded trap test.
+
 2005-04-27  Peter Stephenson  <pws@csr.com>
 
 	* 21197: Src/exec.c, Src/signals.c: LOCAL_TRAPS didn't restore
diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst
index b9d909761..ee4c1c069 100644
--- a/Test/C03traps.ztst
+++ b/Test/C03traps.ztst
@@ -228,14 +228,14 @@
 # Autoloaded traps are horrid, but unfortunately people expect
 # them to work if we support them.
   echo "print Running exit trap" >TRAPEXIT
-  $ZTST_testdir/../Src/zsh -fc '
+  ${${ZTST_exe##[^/]*}:-$ZTST_testdir/$ZTST_exe} -fc '
     fpath=(. $fpath)
     autoload TRAPEXIT
     print "Exiting, attempt 1"
     exit
     print "What?"
   '
-  $ZTST_testdir/../Src/zsh -fc '
+  ${${ZTST_exe##[^/]*}:-$ZTST_testdir/$ZTST_exe} -fc '
     fpath=(. $fpath)
     autoload TRAPEXIT;
     fn() { print Some function }
@@ -249,3 +249,7 @@
 >Some function
 >Exiting, attempt 2
 >Running exit trap
+
+%clean
+
+  rm -f TRAPEXIT