[hackers] [sbase] tests: Remove cleanup functions || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Mon, 8 Dec 2025 17:31:24 +0100 (CET)

commit c63dd6d49941778ad99fb1f2834f97626a511ccb
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.net>
AuthorDate: Mon Dec 8 17:30:50 2025 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.net>
CommitDate: Mon Dec 8 17:30:50 2025 +0100

    tests: Remove cleanup functions

diff --git a/tests/0001-echo.sh b/tests/0001-echo.sh
index 08c96b0..db26c68 100755
--- a/tests/0001-echo.sh
+++ b/tests/0001-echo.sh
_AT_@ -4,14 +4,8 @@ set -e
 
 tmp=tmp1.$$
 
-cleanup()
-{
- st=$?
- rm -f $tmp
- exit $st
-}
-
-trap cleanup EXIT
+trap 'rm -f $tmp' EXIT
+trap 'rm -f $tmp; kill -KILL $$' HUP INT TERM
 
 ../echo -n --hello-- --world--! > $tmp
 
diff --git a/tests/0002-printf.sh b/tests/0002-printf.sh
index 0ea05f4..a8f51a0 100755
--- a/tests/0002-printf.sh
+++ b/tests/0002-printf.sh
_AT_@ -5,14 +5,8 @@ set -e
 res1=tmp1.$$
 res2=tmp2.$$
 
-cleanup()
-{
- st=$?
- rm -f $res1 $res2
- exit $st
-}
-
-trap cleanup EXIT
+trap 'rm -f $res1 $res2' EXIT
+trap 'rm -f $res1 $res2; kill -KILL $$' HUP INT TERM
 
 (
         ../printf '123\n'
diff --git a/tests/0003-ed.sh b/tests/0003-ed.sh
index f4a0acb..2310958 100755
--- a/tests/0003-ed.sh
+++ b/tests/0003-ed.sh
_AT_@ -5,14 +5,8 @@ set -e
 tmp1=tmp1.$$
 tmp2=tmp2.$$
 
-cleanup()
-{
- st=$?
- rm -f $tmp1 $tmp2
- exit $st
-}
-
-trap cleanup EXIT
+trap 'rm -f $tmp1 $tmp2' EXIT
+trap 'rm -f $tmp1 $tmp2; kill -KILL $$' HUP INT TERM
 
 cat <<EOF >$tmp1
 foo
diff --git a/tests/0004-ed.sh b/tests/0004-ed.sh
index fe8e998..d09fd48 100755
--- a/tests/0004-ed.sh
+++ b/tests/0004-ed.sh
_AT_@ -5,14 +5,8 @@ set -e
 tmp1=tmp1.$$
 tmp2=tmp2.$$
 
-cleanup()
-{
- st=$?
- rm -f $tmp1 $tmp2
- exit $st
-}
-
-trap cleanup EXIT
+trap 'rm -f $tmp1 $tmp2' EXIT
+trap 'rm -f $tmp1 $tmp2; kill -KILL $$' HUP INT TERM
 
 printf foo >$tmp1
 ../ed $tmp1 <<EOF >$tmp2
diff --git a/tests/0005-ed.sh b/tests/0005-ed.sh
index 7a55180..7248fa1 100755
--- a/tests/0005-ed.sh
+++ b/tests/0005-ed.sh
_AT_@ -4,14 +4,8 @@ set -e
 
 tmp1=tmp1.$$
 
-cleanup()
-{
- st=$?
- rm -f $tmp1
- exit $st
-}
-
-trap cleanup EXIT
+trap 'rm -f $tmp1' EXIT
+trap 'rm -f $tmp1; kill -KILL $$' HUP INT TERM
 
 ../ed <<EOF >$tmp1
 i
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 9433ae2..d0d078e 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
_AT_@ -2,14 +2,8 @@
 
 export TZ=UTC
 
-cleanup()
-{
- st=$?
- rm -f test.res
- exit $st
-}
-
-trap cleanup EXIT HUP INT TERM
+trap 'rm -f test.res' EXIT HUP INT TERM
+trap 'rm -f test.res' HUP INT TERM
 
 for i in *-*.sh
 do
Received on Mon Dec 08 2025 - 17:31:24 CET