Clean up properly in the dlog_cpu script

Change-Id: I3e25774123006daea442cc3bbcccaf7abf42db8a

diff --git a/tests/dlog_cpu.in b/tests/dlog_cpu.in
index 3c25e00..0e9fdfc 100644 (file)
--- a/tests/dlog_cpu.in
+++ b/tests/dlog_cpu.in
@@ -26,10 +26,20 @@ mount | grep ' / ' | grep rw > /dev/null || { echo "*** ERROR: root not mounted
 export DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.cpu"
 PATH=$PATH:@libexecdir@/libdlog/
 
+LOGGER=-1
+TEST=-1
 RUNTIME_FILTERS_DIR="/tmp/dlog-filters/"
-mkdir -p "$RUNTIME_FILTERS_DIR"
-
 WRITER_DIR="/tmp/dlog-writers/"
+
+cleanup() {
+       [ $LOGGER -ne -1 ] && kill $LOGGER > /dev/null 2>&1
+       [ $TEST -ne -1 ] && kill $TEST > /dev/null 2>&1
+       [ -d $RUNTIME_FILTERS_DIR ] && rm -rf $RUNTIME_FILTERS_DIR
+       [ -d $WRITER_DIR ] && rm -rf $WRITER_DIR
+}
+trap cleanup 0
+
+mkdir -p "$RUNTIME_FILTERS_DIR"
 mkdir -p "$WRITER_DIR"
 
 dlog_logger &
@@ -39,9 +49,3 @@ sleep 1
 TEST=$!
 sleep 10
 ps --no-headers --quick-pid $LOGGER --format %cpu
-kill $TEST
-wait $TEST
-kill $LOGGER
-wait $LOGGER
-
-rm -rf "$DLOG_CONFIG_DIR"