Gen-ust-events: use options instead of arguments

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

diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count
index 464f4aacb69b60fe1879e88c520863c994d7802d..77a925c610817b374142295367513a18fa1541db 100755 (executable)
--- a/tests/regression/tools/live/test_ust_tracefile_count
+++ b/tests/regression/tools/live/test_ust_tracefile_count
@@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing with tracefile_count"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
 NR_ITER=1
 NR_USEC_WAIT=1
 DELAY_USEC=2000000
@@ -60,63 +56,29 @@ function clean_live_tracing()
        rm -rf $TRACE_PATH
 }
 
-if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
-       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --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
-       # Wait for sessiond to bootstrap
-       sleep 2
-fi
-
-opt="-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
+file_sync_after_first=$(mktemp -u)
+
+start_lttng_sessiond_notap
+start_lttng_relayd_notap "-o $TRACE_PATH"
 
 setup_live_tracing
 
 # Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
-# Wait for app to complete
-while [ -n "$(pidof $TESTAPP_NAME)" ]; do
+$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event ${file_sync_after_first} >/dev/null 2>&1
+
+while [ ! -f "${file_sync_after_first}" ]; do
        sleep 0.5
 done
 
 # Start the live test
 $TESTDIR/regression/tools/live/live_test
 
+# Wait for the applications started in background
+wait
+
 clean_live_tracing
 
-# Kill the relayd
-PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD >/dev/null 2>&1
-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 >/dev/null 2>&1
-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
+rm -f ${file_sync_after_first}
+
+stop_lttng_relayd_notap
+stop_lttng_sessiond_notap