tests: Use exit in signal traps - sbase - suckless unix tools
HTML git clone git://git.suckless.org/sbase
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 59f7e452709216715949d90bc9ba1872c33bc6b9
DIR parent ead2c4616a171a905dd0822be111e08947559d90
HTML Author: Roberto E. Vargas Caballero <k0ga@shike2.net>
Date: Mon, 5 Jan 2026 22:29:57 +0100
tests: Use exit in signal traps
It avoids duplicating the cleaning actions and keep the correct exit
status.
Diffstat:
M tests/0001-echo.sh | 2 +-
M tests/0002-printf.sh | 2 +-
M tests/0003-ed.sh | 2 +-
M tests/0004-ed.sh | 2 +-
M tests/0005-ed.sh | 2 +-
M tests/0007-ed.sh | 2 +-
M tests/0008-ed.sh | 2 +-
M tests/0010-bc.sh | 2 +-
M tests/0011-ed.sh | 2 +-
M tests/0012-ed.sh | 2 +-
M tests/0013-ed.sh | 2 +-
M tests/0018-ed.sh | 2 +-
M tests/0019-ed.sh | 2 +-
M tests/0020-ed.sh | 2 +-
M tests/0021-ed.sh | 2 +-
M tests/0023-ed.sh | 2 +-
M tests/0024-ed.sh | 2 +-
M tests/0025-ed.sh | 2 +-
M tests/runtests.sh | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
---
DIR diff --git a/tests/0001-echo.sh b/tests/0001-echo.sh
@@ -5,7 +5,7 @@ set -e
tmp=tmp1.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
../echo -n --hello-- --world--! > $tmp
DIR diff --git a/tests/0002-printf.sh b/tests/0002-printf.sh
@@ -6,7 +6,7 @@ res1=tmp1.$$
res2=tmp2.$$
trap 'rm -f $res1 $res2' EXIT
-trap 'rm -f $res1 $res2; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
(
../printf '123\n'
DIR diff --git a/tests/0003-ed.sh b/tests/0003-ed.sh
@@ -6,7 +6,7 @@ tmp1=tmp1.$$
tmp2=tmp2.$$
trap 'rm -f $tmp1 $tmp2' EXIT
-trap 'rm -f $tmp1 $tmp2; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp1
foo
DIR diff --git a/tests/0004-ed.sh b/tests/0004-ed.sh
@@ -6,7 +6,7 @@ tmp1=tmp1.$$
tmp2=tmp2.$$
trap 'rm -f $tmp1 $tmp2' EXIT
-trap 'rm -f $tmp1 $tmp2; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
printf foo >$tmp1
../ed $tmp1 <<EOF >$tmp2
DIR diff --git a/tests/0005-ed.sh b/tests/0005-ed.sh
@@ -5,7 +5,7 @@ set -e
tmp1=tmp1.$$
trap 'rm -f $tmp1' EXIT
-trap 'rm -f $tmp1; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
../ed <<EOF >$tmp1
i
DIR diff --git a/tests/0007-ed.sh b/tests/0007-ed.sh
@@ -5,7 +5,7 @@ set -e
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
printf 'something important' > $tmp
../ed -s $tmp <<EOF 2>/dev/null | diff -w $tmp -
DIR diff --git a/tests/0008-ed.sh b/tests/0008-ed.sh
@@ -5,7 +5,7 @@ set -e
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
../ed -s <<EOF > /dev/null
0a
DIR diff --git a/tests/0010-bc.sh b/tests/0010-bc.sh
@@ -3,7 +3,7 @@
tmp=$$.tmp
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
0
DIR diff --git a/tests/0011-ed.sh b/tests/0011-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
y
DIR diff --git a/tests/0012-ed.sh b/tests/0012-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
x
DIR diff --git a/tests/0013-ed.sh b/tests/0013-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
x
DIR diff --git a/tests/0018-ed.sh b/tests/0018-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
touch $tmp
../ed -s $tmp <<EOF | (read a && test $a = 1)
DIR diff --git a/tests/0019-ed.sh b/tests/0019-ed.sh
@@ -2,7 +2,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
set -e
DIR diff --git a/tests/0020-ed.sh b/tests/0020-ed.sh
@@ -2,7 +2,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
set -e
DIR diff --git a/tests/0021-ed.sh b/tests/0021-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
1
DIR diff --git a/tests/0023-ed.sh b/tests/0023-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF >$tmp
Line
DIR diff --git a/tests/0024-ed.sh b/tests/0024-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<EOF > $tmp
static int radix = 16;
DIR diff --git a/tests/0025-ed.sh b/tests/0025-ed.sh
@@ -3,7 +3,7 @@
tmp=tmp.$$
trap 'rm -f $tmp' EXIT
-trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
+trap 'exit $?' HUP INT TERM
cat <<'EOF' > $tmp
LLL\
DIR diff --git a/tests/runtests.sh b/tests/runtests.sh
@@ -3,7 +3,7 @@
export TZ=UTC
trap 'rm -f test.res' EXIT HUP INT TERM
-trap 'rm -f test.res' HUP INT TERM
+trap 'exit $?' HUP INT TERM
for i in *-*.sh
do