summaryrefslogtreecommitdiff
path: root/shell/hush_test
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-25 00:06:51 +0200
committerDenys Vlasenko2009-09-25 00:06:51 +0200
commit21d87d495a78f9207d643a5bf99061d4401370ef (patch)
tree455c5f4d34aad1885b7b793230cef11c5c750339 /shell/hush_test
parent0800e3af75461c6322427dab53d3526066453b04 (diff)
downloadbusybox-21d87d495a78f9207d643a5bf99061d4401370ef.zip
busybox-21d87d495a78f9207d643a5bf99061d4401370ef.tar.gz
ash: better handling of EXIT trap in `trap` hack
function old new delta forkchild - 602 +602 trapcmd 255 347 +92 ash_main 1362 1375 +13 evalvar 1371 1373 +2 popstring 140 134 -6 forkshell 835 248 -587 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 3/2 up/down: 709/-593) Total: 116 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test')
-rw-r--r--shell/hush_test/hush-trap/savetrap.right5
-rwxr-xr-xshell/hush_test/hush-trap/savetrap.tests7
2 files changed, 10 insertions, 2 deletions
diff --git a/shell/hush_test/hush-trap/savetrap.right b/shell/hush_test/hush-trap/savetrap.right
index 2d33427..9cfd7a5 100644
--- a/shell/hush_test/hush-trap/savetrap.right
+++ b/shell/hush_test/hush-trap/savetrap.right
@@ -1,3 +1,8 @@
+trap -- 'echo Exiting' EXIT
trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo Exiting' EXIT
+trap -- 'echo WINCH!' SIGWINCH
+trap -- 'echo Exiting' EXIT
trap -- 'echo WINCH!' SIGWINCH
Done
+Exiting
diff --git a/shell/hush_test/hush-trap/savetrap.tests b/shell/hush_test/hush-trap/savetrap.tests
index 6492e86..c2b312f 100755
--- a/shell/hush_test/hush-trap/savetrap.tests
+++ b/shell/hush_test/hush-trap/savetrap.tests
@@ -1,6 +1,9 @@
+trap 'echo Exiting' EXIT
trap 'echo WINCH!' SIGWINCH
v=` trap `
-echo $v
+echo "$v"
+v=$( trap )
+echo "$v"
v=`trap`
-echo $v
+echo "$v"
echo Done