Fix: regression tests

[lttng-tools.git] / tests / regression / tools / live / test_kernel

diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
index 4b958dff8ee6761d336b94beb248d2fd9a6a7078..0e542da6a6b76f6010e7e75649a1db0da491f7a6 100755 (executable)
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -62,22 +62,8 @@ else
        exit 0
 fi
 
-if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
-       if [ $? -eq 1 ]; then
-               echo "Fail to start lttng-sessiond"
-               exit 1
-       fi
-fi
-
-opt="--background -o $TRACE_PATH"
-if [ -z $(pidof lt-$RELAYD_BIN) ]; then
-       $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1
-       if [ $? -eq 1 ]; then
-               echo "Fail to start lttng-relayd (opt: $opt)"
-               return 1
-       fi
-fi
+start_lttng_sessiond_notap
+start_lttng_relayd_notap "-o $TRACE_PATH"
 
 setup_live_tracing
 
@@ -86,30 +72,5 @@ $TESTDIR/regression/tools/live/live_test
 
 clean_live_tracing
 
-# Kill the relayd
-PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD
-if [ $? -eq 1 ]; then
-       echo "Kill lttng-relayd (pid: $PID_RELAYD)"
-       exit 1
-else
-       out=1
-       while [ -n "$out" ]; do
-               out=$(pidof lt-$RELAYD_BIN)
-               sleep 0.5
-       done
-fi
-
-# Kill the sessiond
-PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND
-if [ $? -eq 1 ]; then
-       echo "Kill sessiond daemon"
-       exit 1
-else
-       out=1
-       while [ -n "$out" ]; do
-               out=$(pidof lt-$SESSIOND_BIN)
-               sleep 0.5
-       done
-fi
+stop_lttng_relayd_notap
+stop_lttng_sessiond_notap