X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Ftest_notification_ust;h=d0198f05a5058bc66ab1c17ecc889e67b6cfaa92;hb=1e14294fd0ac6ea1b22a27b7b7c10abec2e2d929;hp=70cbec6fed3d86803029d9c2043881f142a7620a;hpb=854382b8a0f18fa77ba97eac55a61dd8d8d8cc85;p=lttng-tools.git

diff --git a/tests/regression/tools/notification/test_notification_ust b/tests/regression/tools/notification/test_notification_ust
index 70cbec6fe..d0198f05a 100755
--- a/tests/regression/tools/notification/test_notification_ust
+++ b/tests/regression/tools/notification/test_notification_ust
@@ -18,8 +18,10 @@
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
 
+TMPDIR=$(mktemp -d)
+
 #This is needed since the testpoint create a pipe with the consumerd type suffixed
-TESTPOINT_BASE_PATH=$(readlink -f "$CURDIR/lttng.t_p_n")
+TESTPOINT_BASE_PATH=$(readlink -f "$TMPDIR/lttng.t_p_n")
 TESTPOINT_PIPE_PATH=$(mktemp -u "${TESTPOINT_BASE_PATH}.XXXXXX")
 TESTPOIT_ARGS="CONSUMER_PAUSE_PIPE_PATH=${TESTPOINT_PIPE_PATH} LTTNG_TESTPOINT_ENABLE=1"
 TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
@@ -28,7 +30,7 @@ TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-TESTAPP_STATE_PATH=$(mktemp -u "$CURDIR/application_state.XXXXXXXXXX")
+TESTAPP_STATE_PATH=$(mktemp -u "$TMPDIR/application_state.XXXXXXXXXX")
 
 NR_ITER=1000
 NR_USEC_WAIT=5
@@ -44,7 +46,7 @@ DIR=$(readlink -f $TESTDIR)
 
 source $TESTDIR/utils/utils.sh
 
-function ust_event_generator_toogle_state
+function ust_event_generator_toggle_state
 {
 	ust_event_generator_suspended=$((ust_event_generator_suspended==0))
 
@@ -53,15 +55,15 @@ function ust_event_generator
 {
 	state_file=$1
 	ust_event_generator_suspended=0
-	trap ust_event_generator_toogle_state SIGUSR1
-	trap "exit" SIGTERM SIGINT
+	trap ust_event_generator_toggle_state SIGUSR1
+
 	while (true); do
 		if [[ $ust_event_generator_suspended -eq "1" ]]; then
 			touch $state_file
 			sleep 0.5
 		else
 			if [[ -f $state_file ]]; then
-				rm $state_file 2> /dev/null
+				rm -rf $state_file 2> /dev/null
 			fi
 			taskset  -c 0 $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT > /dev/null 2>&1
 		fi
@@ -98,8 +100,8 @@ stop_lttng_sessiond_notap
 # Suppress kill message
 kill -9 $APP_PID
 wait $APP_PID 2> /dev/null
-rm ${consumerd_pipe[@]} 2> /dev/null
-rm ${TESTAPP_STATE_PATH} 2> /dev/null
+
+rm -rf $TMPDIR
 
 # Just in case cleanup
 rm -rf $TRACE_PATH