commit 68568d529414af1522832b6fe63bf163306e0c8f parent a4f6e0ebf74b40d95b8d4de20bd0eb890efefaf3 Author: Roberto E. Vargas Caballero <k0ga@shike2.net> Date: Sat, 24 Jan 2026 11:47:43 +0100 build: Use exit $? in signal traps This helps to preserve the exit status instead of just using 1 for all the signals. Diffstat:
172 files changed, 186 insertions(+), 205 deletions(-)
diff --git a/include/scc/bits/scc/Makefile b/include/scc/bits/scc/Makefile @@ -12,7 +12,8 @@ cstd.h: FORCE config.h: FORCE rm -f $@;\ - trap "rm -f $$$$.h" EXIT INT QUIT HUP TERM;\ + trap 'rm -f $$$$.h' EXIT ;\ + trap 'exit $?' INT HUP TERM;\ (echo '#define PREFIX "$(PREFIX)"';\ echo '#define ARCH "$(ARCH)"';\ echo '#define SYS "$(SYS)"';\ @@ -22,7 +23,8 @@ config.h: FORCE sys.h: FORCE rm -f $@;\ - trap "rm -f $$$$.tmp" INT QUIT TERM HUP;\ + trap 'rm -f $$$$.tmp' EXIT;\ + trap 'exit $?' HUP INT TERM;\ sed -e 's/%NOPIE%/"$(NOPIE_LDFLAGS)",/' \ -e 's/"",//' sys-$(LIBPROFILE).h > $$$$.tmp && \ mv $$$$.tmp $@ diff --git a/scripts/config b/scripts/config @@ -1,8 +1,8 @@ #!/bin/sh exec > $$.tmp -trap "rm -f $$.tmp" EXIT -trap "exit $?" HUP INT TERM +trap 'rm -f $$.tmp' EXIT +trap 'exit $?' HUP INT TERM arch=`uname -m` sys=`uname -s | tr 'A-Z' 'a-z'` diff --git a/scripts/mkdep b/scripts/mkdep @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp=$$.tmp diff --git a/scripts/rules.mk b/scripts/rules.mk @@ -133,28 +133,28 @@ $(DIRS) DUMMY : FORCE $(OC) -O binary $< $@ .o.dump: - trap "rm -f $$$$.dump" EXIT;\ - trap "exit 1" HUP INT TERM;\ + trap 'rm -f $$$$.dump' EXIT;\ + trap 'exit $?' HUP INT TERM;\ $(OD) -D $< > $$$$.dump && mv $$$$.dump $@ .elf.map: $(LD) -Map=$@ $< -o /dev/null .puml.eps: - trap "rm -f $$$$.eps" EXIT;\ - trap "exit 1" HUP INT TERM;\ + trap 'rm -f $$$$.eps' EXIT;\ + trap 'exit $?' HUP INT TERM;\ plantuml -p -teps < $< > $$$$.eps && mv $$$$.eps $@ .ms.ps: - trap "rm -f $$$$.ps" EXIT;\ - trap "exit 1" HUP INT TERM;\ + trap 'rm -f $$$$.ps' EXIT;\ + trap 'exit $?' HUP INT TERM;\ $(SOELIM) $< | $(GRAP) | $(PIC) | $(EQN) | $(TBL) |\ $(TROFF) -ms | $(DPOST) > $$$$.ps &&\ mv $$$$.ps $@ .1.ps .2.ps .3.ps .4.ps .5.ps .6.ps .7.ps: - trap "rm -f $$$$.ps" EXIT;\ - trap "exit 1" HUP INT TERM;\ + trap 'rm -f $$$$.ps' EXIT;\ + trap 'exit $?' HUP INT TERM;\ $(TBL) $< | $(TROFF) -man | $(DPOST) > $$$$.ps && mv $$$$.ps $@ .ps.pdf: diff --git a/src/cmd/scc-as/mktbl b/src/cmd/scc-as/mktbl @@ -20,8 +20,8 @@ do done rm -f $$.c $family/${cpu}tbl.c -trap "rm -f $$.c" EXIT -trap "exit 1" HUP INT TERM +trap 'rm -f $$.c' EXIT +trap 'exit $?' HUP INT TERM awk '!/^$/ {print $1,NR,$2,$3,$4,$5,$6}' ops.dat | sort -k1 -k2n | diff --git a/src/cmd/scc-cc/cc2/Makefile b/src/cmd/scc-cc/cc2/Makefile @@ -62,7 +62,7 @@ qbe_arm64-sysv: arm64-sysv error.h: cc2.h trap 'rm -f $$$$.h' EXIT;\ - trap 'exit 1' HUP INT TERM;\ + trap 'exit $?' HUP INT TERM;\ awk -f generror.awk cc2.h > $$$$.h && mv $$$$.h $@ cc2-qbe_amd64-sysv: $(LIBSCC) $(QBE_AMD64_SYSV_OBJS) diff --git a/src/libc/arch/mkerrstr b/src/libc/arch/mkerrstr @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $$.tmp' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM awk ' /^#define[ \t]*E/{ diff --git a/tests/Makefile b/tests/Makefile @@ -15,7 +15,8 @@ PROJECTDIR = .. include $(PROJECTDIR)/scripts/rules.mk all: - @trap 'rm -f $$$$.tmp' EXIT INT HUP TERM;\ + @trap 'rm -f $$$$.tmp' EXIT ;\ + trap 'exit $?' INT HUP TERM;\ for i in $(DIRS);\ do \ cd $$i;\ diff --git a/tests/ar/execute/0001-append.sh b/tests/ar/execute/0001-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0002-append.sh b/tests/ar/execute/0002-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0003-append.sh b/tests/ar/execute/0003-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0004-append.sh b/tests/ar/execute/0004-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ########################################################################### #empty file list diff --git a/tests/ar/execute/0005-append.sh b/tests/ar/execute/0005-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ########################################################################### #empty file list diff --git a/tests/ar/execute/0006-append.sh b/tests/ar/execute/0006-append.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ########################################################################### #recursive inclusion diff --git a/tests/ar/execute/0007-delete.sh b/tests/ar/execute/0007-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #delete one member diff --git a/tests/ar/execute/0008-delete.sh b/tests/ar/execute/0008-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #delete two members, 1st and 2nd diff --git a/tests/ar/execute/0009-delete.sh b/tests/ar/execute/0009-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #delete two members, 2nd and 3rd diff --git a/tests/ar/execute/0010-delete.sh b/tests/ar/execute/0010-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #remove all the members diff --git a/tests/ar/execute/0011-delete.sh b/tests/ar/execute/0011-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #no members diff --git a/tests/ar/execute/0012-delete.sh b/tests/ar/execute/0012-delete.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #delete one member diff --git a/tests/ar/execute/0013-print.sh b/tests/ar/execute/0013-print.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0014-print.sh b/tests/ar/execute/0014-print.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0015-print.sh b/tests/ar/execute/0015-print.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0016-print.sh b/tests/ar/execute/0016-print.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0017-print.sh b/tests/ar/execute/0017-print.sh @@ -2,15 +2,8 @@ set -e -cleanup() -{ - st=$? - rm -f file.a $tmp1 $tmp2 - exit $st -} - trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0018-list.sh b/tests/ar/execute/0018-list.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0019-list.sh b/tests/ar/execute/0019-list.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=`mktemp` diff --git a/tests/ar/execute/0020-list.sh b/tests/ar/execute/0020-list.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0021-list.sh b/tests/ar/execute/0021-list.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0022-list.sh b/tests/ar/execute/0022-list.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0023-extract.sh b/tests/ar/execute/0023-extract.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file*' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #extract 1st member diff --git a/tests/ar/execute/0024-extract.sh b/tests/ar/execute/0024-extract.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file*' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #extract 3rd member diff --git a/tests/ar/execute/0025-extract.sh b/tests/ar/execute/0025-extract.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file*' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM ############################################################################ #extract 3rd member diff --git a/tests/ar/execute/0026-extract.sh b/tests/ar/execute/0026-extract.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0027-extract.sh b/tests/ar/execute/0027-extract.sh @@ -2,15 +2,8 @@ set -e -cleanup() -{ - st=$? - rm -f file* $tmp1 $tmp2 - exit $st -} - trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0029-move.sh b/tests/ar/execute/0029-move.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0030-move.sh b/tests/ar/execute/0030-move.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0031-move.sh b/tests/ar/execute/0031-move.sh @@ -2,15 +2,8 @@ set -e -cleanup() -{ - st=$? - rm -f file* $tmp1 $tmp2 - exit $st -} - trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0032-update.sh b/tests/ar/execute/0032-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0033-update.sh b/tests/ar/execute/0033-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0034-update.sh b/tests/ar/execute/0034-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0035-update.sh b/tests/ar/execute/0035-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0036-update.sh b/tests/ar/execute/0036-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0037-update.sh b/tests/ar/execute/0037-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/0038-update.sh b/tests/ar/execute/0038-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=`mktemp` tmp2=`mktemp` diff --git a/tests/ar/execute/0039-update.sh b/tests/ar/execute/0039-update.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f file* $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/ar/execute/chktest.sh b/tests/ar/execute/chktest.sh @@ -1,7 +1,7 @@ #!/bin/sh -trap "rm -rf file*" EXIT -trap "exit 1" HUP INT TERM +trap 'rm -rf file*' EXIT +trap 'exit $?' HUP INT TERM rm -f test.log diff --git a/tests/as/execute/test.sh b/tests/as/execute/test.sh @@ -9,7 +9,8 @@ tmp1=tmp1.$$ tmp2=tmp2.$$ file=$cpu.s -trap "rm -f a.out $tmp1 $tmp2" 0 2 3 +trap 'rm -f a.out $tmp1 $tmp2' EXIT +trap 'exit $?' HUP INT TERM $EXEC scc as -m $cpu $file diff --git a/tests/cc/error/chktest.sh b/tests/cc/error/chktest.sh @@ -4,7 +4,7 @@ file=${1?' empty input file'} err=/tmp/$$.err chk=/tmp/$$.chk -trap "rm -f a.out *.o $chk $err; exit" 0 1 2 3 15 +trap 'rm -f a.out *.o $chk $err; exit' EXIT HUP INT TERM ulimit -c 0 rm -f test.log diff --git a/tests/cc/execute/chktest.sh b/tests/cc/execute/chktest.sh @@ -1,7 +1,7 @@ #!/bin/sh file=${1?' empty input file'} -trap "rm -f a.out; exit" 0 1 2 3 15 +trap 'rm -f a.out; exit' EXIT HUP INT TERM ulimit -c 0 rm -f test.log diff --git a/tests/libc/execute/chktest.sh b/tests/libc/execute/chktest.sh @@ -3,7 +3,7 @@ file=${1?' empty input file'} trap 'rm -f *.o $tmp1 $tmp2' EXIT -trap 'exit 1' INT QUIT TERM +trap 'exit $?' INT QUIT TERM rm -f test.log diff --git a/tests/make/error/0001-macro.sh b/tests/make/error/0001-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' INT TERM HUP +trap 'exit $?' INT TERM HUP tmp1=tmp1.$$ diff --git a/tests/make/execute/0001-rule.sh b/tests/make/execute/0001-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0002-fflag.sh b/tests/make/execute/0002-fflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0003-fflag.sh b/tests/make/execute/0003-fflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0004-fflag.sh b/tests/make/execute/0004-fflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0005-fflag.sh b/tests/make/execute/0005-fflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0006-iflag.sh b/tests/make/execute/0006-iflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0007-iflag.sh b/tests/make/execute/0007-iflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0008-ignore.sh b/tests/make/execute/0008-ignore.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0009-ignore.sh b/tests/make/execute/0009-ignore.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0010-kflag.sh b/tests/make/execute/0010-kflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0011-kflag.sh b/tests/make/execute/0011-kflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0012-nflag.sh b/tests/make/execute/0012-nflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0013-nflag.sh b/tests/make/execute/0013-nflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0014-nflag.sh b/tests/make/execute/0014-nflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0015-pflag.sh b/tests/make/execute/0015-pflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0016-qflag.sh b/tests/make/execute/0016-qflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0017-qflag.sh b/tests/make/execute/0017-qflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0018-qflag.sh b/tests/make/execute/0018-qflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0019-qflag.sh b/tests/make/execute/0019-qflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0020-rflag.sh b/tests/make/execute/0020-rflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0021-rflag.sh b/tests/make/execute/0021-rflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 file.c file.o' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0022-Sflag.sh b/tests/make/execute/0022-Sflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0023-Sflag.sh b/tests/make/execute/0023-Sflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0024-sflag.sh b/tests/make/execute/0024-sflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0025-sflag.sh b/tests/make/execute/0025-sflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0026-silent.sh b/tests/make/execute/0026-silent.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0027-silent.sh b/tests/make/execute/0027-silent.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0028-tflag.sh b/tests/make/execute/0028-tflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 file1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0029-tflag.sh b/tests/make/execute/0029-tflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 file2' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0030-tflag.sh b/tests/make/execute/0030-tflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 file.o file.c' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0031-tflag.sh b/tests/make/execute/0031-tflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 print-makeflags-always' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0032-tflag.sh b/tests/make/execute/0032-tflag.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 $tmp2 file1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ tmp2=tmp2.$$ diff --git a/tests/make/execute/0033-macro.sh b/tests/make/execute/0033-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0034-macro.sh b/tests/make/execute/0034-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0035-macro.sh b/tests/make/execute/0035-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0036-macro.sh b/tests/make/execute/0036-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0037-macro.sh b/tests/make/execute/0037-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0038-rules.sh b/tests/make/execute/0038-rules.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0039-rules.sh b/tests/make/execute/0039-rules.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 file?' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0040-makefile.sh b/tests/make/execute/0040-makefile.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 makefile' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0041-comment.sh b/tests/make/execute/0041-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0042-comment.sh b/tests/make/execute/0042-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0043-comment.sh b/tests/make/execute/0043-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0044-macro.sh b/tests/make/execute/0044-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0045-comment.sh b/tests/make/execute/0045-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1 ' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0046-makefile.sh b/tests/make/execute/0046-makefile.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0047-include.sh b/tests/make/execute/0047-include.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0048-include.sh b/tests/make/execute/0048-include.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 $tmp2' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ tmp2=tmp2.$$ diff --git a/tests/make/execute/0049-rule.sh b/tests/make/execute/0049-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0050-rule.sh b/tests/make/execute/0050-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0051-rule.sh b/tests/make/execute/0051-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0052-rule.sh b/tests/make/execute/0052-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0053-rule.sh b/tests/make/execute/0053-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0054-rule.sh b/tests/make/execute/0054-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0055-rule.sh b/tests/make/execute/0055-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0056-rule.sh b/tests/make/execute/0056-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0057-default.sh b/tests/make/execute/0057-default.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0058-default.sh b/tests/make/execute/0058-default.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0059-macro.sh b/tests/make/execute/0059-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0060-macro.sh b/tests/make/execute/0060-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0061-macro.sh b/tests/make/execute/0061-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0062-macro.sh b/tests/make/execute/0062-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0063-macro.sh b/tests/make/execute/0063-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0064-macro.sh b/tests/make/execute/0064-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0065-macro.sh b/tests/make/execute/0065-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0066-macro.sh b/tests/make/execute/0066-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0067-macro.sh b/tests/make/execute/0067-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0068-macro.sh b/tests/make/execute/0068-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0069-macro.sh b/tests/make/execute/0069-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0070-macro.sh b/tests/make/execute/0070-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0071-macro.sh b/tests/make/execute/0071-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0072-macro.sh b/tests/make/execute/0072-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0073-macro.sh b/tests/make/execute/0073-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 $tmp2' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0074-macro.sh b/tests/make/execute/0074-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0075-macro.sh b/tests/make/execute/0075-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0076-macro.sh b/tests/make/execute/0076-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0077-macro.sh b/tests/make/execute/0077-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0078-macro.sh b/tests/make/execute/0078-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0079-macro.sh b/tests/make/execute/0079-macro.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0080-rule.sh b/tests/make/execute/0080-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp f.c f.o f' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp=tmp.$$ diff --git a/tests/make/execute/0081-rule.sh b/tests/make/execute/0081-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f f.c f.o f' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM echo hello > f.c diff --git a/tests/make/execute/0082-rule.sh b/tests/make/execute/0082-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 f.c f.o f' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0083-rule.sh b/tests/make/execute/0083-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 f.c f.o' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0084-rule.sh b/tests/make/execute/0084-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 tmp2 f f?' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0085-rule.sh b/tests/make/execute/0085-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 t1.c t?.o t2' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0086-rule.sh b/tests/make/execute/0086-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 t? t' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0087-rule.sh b/tests/make/execute/0087-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0088-comment.sh b/tests/make/execute/0088-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0089-comment.sh b/tests/make/execute/0089-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'rm -f $tmp1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0090-comment.sh b/tests/make/execute/0090-comment.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0091-expansion.sh b/tests/make/execute/0091-expansion.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0092-expansion.sh b/tests/make/execute/0092-expansion.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0093-inference.sh b/tests/make/execute/0093-inference.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f f.? $tmp1 $tmp2 f.?' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ tmp2=tmp2.$$ diff --git a/tests/make/execute/0094-expansion.sh b/tests/make/execute/0094-expansion.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0095-include.sh b/tests/make/execute/0095-include.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0096-escape.sh b/tests/make/execute/0096-escape.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0097-rule.sh b/tests/make/execute/0097-rule.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f f1.? $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0098-signal.sh b/tests/make/execute/0098-signal.sh @@ -2,7 +2,6 @@ cleanup() { - r=$? rm -f test.txt kill -KILL $pid 2>/dev/null if test $1 -ne 0 @@ -10,7 +9,6 @@ cleanup() kill -KILL $$ fi trap - EXIT - exit $? } rm -f file.txt diff --git a/tests/make/execute/0103-env.sh b/tests/make/execute/0103-env.sh @@ -3,7 +3,7 @@ export EFLAGS=World trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0104-env.sh b/tests/make/execute/0104-env.sh @@ -3,7 +3,7 @@ export CFLAGS=World trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0105-include.sh b/tests/make/execute/0105-include.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0106-inference.sh b/tests/make/execute/0106-inference.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f f.? $tmp1 f.?' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0107-inference.sh b/tests/make/execute/0107-inference.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1 f f.?' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/make/execute/0108-lastopt.sh b/tests/make/execute/0108-lastopt.sh @@ -1,7 +1,7 @@ #!/bin/sh trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0001-z80.sh b/tests/nm/execute/0001-z80.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0002-z80-u.sh b/tests/nm/execute/0002-z80-u.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0003-z80-g.sh b/tests/nm/execute/0003-z80-g.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0004-z80-v.sh b/tests/nm/execute/0004-z80-v.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0005-z80-A.sh b/tests/nm/execute/0005-z80-A.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f f.out f.a $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0006-z80-o.sh b/tests/nm/execute/0006-z80-o.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0007-z80-d.sh b/tests/nm/execute/0007-z80-d.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0008-z80-x.sh b/tests/nm/execute/0008-z80-x.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0009-z80-P-o.sh b/tests/nm/execute/0009-z80-P-o.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0010-z80-P-d.sh b/tests/nm/execute/0010-z80-P-d.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0011-z80-P-x.sh b/tests/nm/execute/0011-z80-P-x.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/nm/execute/0012-z80-f.sh b/tests/nm/execute/0012-z80-f.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ $EXEC scc nm -f z80.out > $tmp1 diff --git a/tests/nm/execute/0013-z80-a.sh b/tests/nm/execute/0013-z80-a.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/size/execute/0001-z80.sh b/tests/size/execute/0001-z80.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/size/execute/0002-z80-t.sh b/tests/size/execute/0002-z80-t.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ diff --git a/tests/strip/execute/0001-z80.sh b/tests/strip/execute/0001-z80.sh @@ -3,7 +3,7 @@ set -e trap 'rm -f $tmp1 $tmp2' EXIT -trap 'exit 1' HUP INT TERM +trap 'exit $?' HUP INT TERM tmp1=tmp1.$$ tmp2=tmp2.$$