[hackers] [sbase] tests: Use exit in signal traps || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Mon, 5 Jan 2026 22:31:07 +0100 (CET)

commit 59f7e452709216715949d90bc9ba1872c33bc6b9
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.net>
AuthorDate: Mon Jan 5 22:29:57 2026 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.net>
CommitDate: Mon Jan 5 22:29:57 2026 +0100

    tests: Use exit in signal traps
    
    It avoids duplicating the cleaning actions and keep the correct exit
    status.

diff --git a/tests/0001-echo.sh b/tests/0001-echo.sh
index db26c68..f2f6656 100755
--- a/tests/0001-echo.sh
+++ b/tests/0001-echo.sh
_AT_@ -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
 
diff --git a/tests/0002-printf.sh b/tests/0002-printf.sh
index a8f51a0..5abf8e1 100755
--- a/tests/0002-printf.sh
+++ b/tests/0002-printf.sh
_AT_@ -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'
diff --git a/tests/0003-ed.sh b/tests/0003-ed.sh
index 2310958..a6ba236 100755
--- a/tests/0003-ed.sh
+++ b/tests/0003-ed.sh
_AT_@ -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
diff --git a/tests/0004-ed.sh b/tests/0004-ed.sh
index d09fd48..1890dc2 100755
--- a/tests/0004-ed.sh
+++ b/tests/0004-ed.sh
_AT_@ -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
diff --git a/tests/0005-ed.sh b/tests/0005-ed.sh
index 7248fa1..2534486 100755
--- a/tests/0005-ed.sh
+++ b/tests/0005-ed.sh
_AT_@ -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
diff --git a/tests/0007-ed.sh b/tests/0007-ed.sh
index cb51676..0058811 100755
--- a/tests/0007-ed.sh
+++ b/tests/0007-ed.sh
_AT_@ -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 -
diff --git a/tests/0008-ed.sh b/tests/0008-ed.sh
index a01fbf0..30ecf06 100755
--- a/tests/0008-ed.sh
+++ b/tests/0008-ed.sh
_AT_@ -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
diff --git a/tests/0010-bc.sh b/tests/0010-bc.sh
index 1aa16e1..e742a64 100755
--- a/tests/0010-bc.sh
+++ b/tests/0010-bc.sh
_AT_@ -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
diff --git a/tests/0011-ed.sh b/tests/0011-ed.sh
index feb3c93..e9a1dc4 100755
--- a/tests/0011-ed.sh
+++ b/tests/0011-ed.sh
_AT_@ -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
diff --git a/tests/0012-ed.sh b/tests/0012-ed.sh
index e16d67a..8b39d9a 100755
--- a/tests/0012-ed.sh
+++ b/tests/0012-ed.sh
_AT_@ -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
diff --git a/tests/0013-ed.sh b/tests/0013-ed.sh
index 699a40f..b17329f 100755
--- a/tests/0013-ed.sh
+++ b/tests/0013-ed.sh
_AT_@ -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
diff --git a/tests/0018-ed.sh b/tests/0018-ed.sh
index 25ff026..89a6043 100755
--- a/tests/0018-ed.sh
+++ b/tests/0018-ed.sh
_AT_@ -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)
diff --git a/tests/0019-ed.sh b/tests/0019-ed.sh
index cee3bd1..685c823 100755
--- a/tests/0019-ed.sh
+++ b/tests/0019-ed.sh
_AT_@ -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
 
diff --git a/tests/0020-ed.sh b/tests/0020-ed.sh
index 8a78ebe..e1d67e3 100755
--- a/tests/0020-ed.sh
+++ b/tests/0020-ed.sh
_AT_@ -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
 
diff --git a/tests/0021-ed.sh b/tests/0021-ed.sh
index fc56bd8..727aa9a 100755
--- a/tests/0021-ed.sh
+++ b/tests/0021-ed.sh
_AT_@ -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
diff --git a/tests/0023-ed.sh b/tests/0023-ed.sh
index bc2b707..f446b6f 100755
--- a/tests/0023-ed.sh
+++ b/tests/0023-ed.sh
_AT_@ -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
diff --git a/tests/0024-ed.sh b/tests/0024-ed.sh
index 205f84c..6b3bf8f 100755
--- a/tests/0024-ed.sh
+++ b/tests/0024-ed.sh
_AT_@ -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;
diff --git a/tests/0025-ed.sh b/tests/0025-ed.sh
index b213747..e5d1c64 100755
--- a/tests/0025-ed.sh
+++ b/tests/0025-ed.sh
_AT_@ -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\
diff --git a/tests/runtests.sh b/tests/runtests.sh
index d0d078e..3ed0f61 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
_AT_@ -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
Received on Mon Jan 05 2026 - 22:31:07 CET