From 2ca83614e78f32e68202100e94668b0bb62f1ba6 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 3 Feb 2012 16:12:04 +1100 Subject: [PATCH] Use 'trap' builtin to clean up temporaries in test scripts Some of the test scripts create temporary files, which we remove at the end. Except that we usually forgot to remove them on some exit paths. To avoid this problem in future, this modifies the scripts to use the shell's trap 0 functionality to automatically remove the temporaries on any exit. Signed-off-by: David Gibson --- tests/dtc-checkfails.sh | 6 ++---- tests/fdtget-runtest.sh | 10 ++++------ tests/fdtput-runtest.sh | 10 ++++------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/dtc-checkfails.sh b/tests/dtc-checkfails.sh index e7aa25e..87992a0 100755 --- a/tests/dtc-checkfails.sh +++ b/tests/dtc-checkfails.sh @@ -10,9 +10,9 @@ for x; do CHECKS="$CHECKS $x" done -LOG="tmp.log.$$" - +LOG=tmp.log.$$ rm -f $LOG +trap "rm -f $LOG" 0 verbose_run_log "$LOG" $VALGRIND "$DTC" -o /dev/null "$@" ret="$?" @@ -28,6 +28,4 @@ for c in $CHECKS; do fi done -rm -f $LOG - PASS diff --git a/tests/fdtget-runtest.sh b/tests/fdtget-runtest.sh index c17c8f9..44c3529 100755 --- a/tests/fdtget-runtest.sh +++ b/tests/fdtget-runtest.sh @@ -2,10 +2,10 @@ . ./tests.sh -LOG="tmp.log.$$" -EXPECT="tmp.expect.$$" - -rm -f $LOG +LOG=tmp.log.$$ +EXPECT=tmp.expect.$$ +rm -f $LOG $EXPECT +trap "rm -f $LOG $EXPECT" 0 expect="$1" echo "$expect" >$EXPECT @@ -26,8 +26,6 @@ fi diff $EXPECT $LOG ret="$?" -rm -f $LOG $EXPECT - if [ "$ret" -eq 0 ]; then PASS else diff --git a/tests/fdtput-runtest.sh b/tests/fdtput-runtest.sh index 8e4cd95..c4b2135 100644 --- a/tests/fdtput-runtest.sh +++ b/tests/fdtput-runtest.sh @@ -8,10 +8,10 @@ . ./tests.sh -LOG="tmp.log.$$" -EXPECT="tmp.expect.$$" - -rm -f $LOG +LOG=tmp.log.$$ +EXPECT=tmp.expect.$$ +rm -f $LOG $EXPECT +trap "rm -f $LOG $EXPECT" 0 expect="$1" echo "$expect" >$EXPECT @@ -46,8 +46,6 @@ fi diff $EXPECT $LOG ret="$?" -rm -f $LOG $EXPECT - if [ "$ret" -eq 0 ]; then PASS else