9os

commit 3cbbe182d17752b92f5efecfe75a9ad5d3b2b239
parent e273e5fbbbd1f541503ed1e62984dc65bda5d8f6
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu, 11 Oct 2018 09:14:18 +0100

Be uniform in all the trap shell commands

Using '' allows the use of $? so, there is not need of
using more of one trap. It is also a good option to
include SIGTERM in the list of trapped functions.

Diffstat:
M
scripts/genrscb.sh
 | 
2
+-
M
src/libtypes/gendep.sh
 | 
2
+-
M
test/test1/test.sh
 | 
9
+++------
M
test/test2/test.sh
 | 
6
++----

4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/scripts/genrscb.sh b/scripts/genrscb.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -e
-trap 'rm -f pack_*.c unpack_*.c rscb.h;exit 1'  HUP INT QUIT
+trap 'rm -f pack_*.c unpack_*.c rscb.h;exit $?'  EXIT HUP INT QUIT TERM
 
 for i
 do
diff --git a/src/libtypes/gendep.sh b/src/libtypes/gendep.sh
@@ -19,7 +19,7 @@ do
 done
 
 tmp=tmp1.$$
-trap 'rm -f $tmp1 $tmp2;exit $?' EXIT HUP INT QUIT
+trap 'rm -f $tmp1 $tmp2;exit $?' EXIT HUP INT QUIT TERM
 
 
 (cat <<'EOF'
diff --git a/test/test1/test.sh b/test/test1/test.sh
@@ -2,9 +2,9 @@
 
 set -e
 
-tmp1=`mktemp`
-tmp2=`mktemp`
-trap "rm -f $tmp1 $tmp2;exit 1" EXIT INT QUIT TERM
+tmp1=tmp1.$$
+tmp2=tmp2.$$
+trap 'rm -f $tmp1 $tmp2;exit $?' EXIT HUP INT QUIT TERM
 
 $EMUCMD ./run | grep -v 'bad RMC' > $tmp1
 sed 's/\./_/g' < $SCRIPTDIR/rmu.cmd > $tmp2
@@ -22,6 +22,3 @@ END            {
 		}
 	}
 }'
-
-rm $tmp1 $tmp2
-trap - EXIT
diff --git a/test/test2/test.sh b/test/test2/test.sh
@@ -2,10 +2,8 @@
 
 set -e
 
-tmp1=`mktemp`
-trap "rm -f $tmp1;exit 1" EXIT INT QUIT TERM
+tmp1=tmp.$$
+trap 'rm -f $tmp1;exit $?' EXIT HUP INT QUIT TERM
 
 $EMUCMD ./run > $tmp1
 diff -u $tmp1 test.exp
-rm $tmp1
-trap - EXIT