Backport: Use lttng_snapshot_add_output_ok from utils

[deliverable/lttng-tools.git] / tests / regression / tools / snapshots / test_ust_streaming

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index e64b10cdc6c2665f666c93c3bbd815b6a6fe3273..cf65674b5cd48dddd472aa8765a5b5dd5c0dfca7 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -28,6 +28,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 NR_ITER=2000000
 NR_USEC_WAIT=100
+APPS_PID=
 
 TRACE_PATH=$(mktemp -d)
 
@@ -39,19 +40,34 @@ if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
 fi
 
-function snapshot_add_output ()
+# Start trace application and return once one event has been hit.
+function start_test_app()
 {
-       local sess_name=$1
-       local trace_path=$2
-       local name=$3
-       local extra_opt=""
-
-       if [ ! -z $name ]; then
-               extra_opt="-n $name"
-       fi
+       local tmp_file=$(mktemp -u)
+
+       # Start application with a temporary file.
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
+       ret=$?
+       APPS_PID="${APPS_PID} ${!}"
+       ok $ret "Start application to trace"
+
+       # Wait for the application file to appear indicating that at least one
+       # tracepoint has been fired.
+       while [ ! -f "$tmp_file" ]; do
+               sleep 0.5
+       done
+       diag "Removing test app temporary file $tmp_file"
+       rm -f $tmp_file
+}
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
-       ok $? "Added snapshot output $trace_path"
+function stop_test_apps()
+{
+       diag "Stopping $TESTAPP_NAME"
+       for p in ${APPS_PID}; do
+               kill ${p}
+               wait ${p} 2>/dev/null
+       done
+       APPS_PID=
 }
 
 # Test a snapshot using a default name for the output destination.
@@ -60,36 +76,37 @@ function test_ust_default_name_with_del()
        diag "Test UST snapshot streaming with default name with delete output"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-       ok $? "Start application to trace"
-       snapshot_add_output $SESSION_NAME "net://localhost"
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       start_test_app
+
+       lttng_snapshot_add_output_ok $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
        # Validate test
        echo $TRACE_PATH/$HOSTNAME/snapshot-1
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
        if [ $? -ne 0 ]; then
+               stop_test_apps
                return $?
        fi
 
-       lttng_snapshot_del_output $SESSION_NAME 1
-       snapshot_add_output $SESSION_NAME "net://localhost"
+       lttng_snapshot_del_output_ok $SESSION_NAME 1
+       lttng_snapshot_add_output_ok $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
        # Validate test with the next ID since a del output was done prior.
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-2*
        if [ $? -ne 0 ]; then
+               stop_test_apps
                return $?
        fi
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
-       diag "Killing $TESTAPP_NAME"
-       PID_APP=`pidof $TESTAPP_NAME`
-       kill $PID_APP >/dev/null 2>&1
+       stop_test_apps
 
        return 0
 }
@@ -100,21 +117,20 @@ function test_ust_default_name()
        diag "Test UST snapshot streaming with default name"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-       ok $? "Start application to trace"
-       snapshot_add_output $SESSION_NAME "net://localhost"
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       start_test_app
+
+       lttng_snapshot_add_output_ok $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
        out=$?
 
-       diag "Killing $TESTAPP_NAME"
-       PID_APP=`pidof $TESTAPP_NAME`
-       kill $PID_APP >/dev/null 2>&1
+       stop_test_apps
 
        return $out
 }
@@ -124,21 +140,20 @@ function test_ust_default_name_custom_uri()
        diag "Test UST snapshot streaming with default name with custom URL"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-       ok $? "Start application to trace"
-       snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       start_test_app
+
+       lttng_snapshot_add_output_ok $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
        out=$?
 
-       diag "Killing $TESTAPP_NAME"
-       PID_APP=`pidof $TESTAPP_NAME`
-       kill $PID_APP >/dev/null 2>&1
+       stop_test_apps
 
        return $out
 }
@@ -152,14 +167,15 @@ function test_ust_custom_name()
        diag "Test UST snapshot streaming with custom name"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
-       ok $? "Start application to trace"
-       snapshot_add_output $SESSION_NAME "net://localhost" $name
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       start_test_app
+
+       lttng_snapshot_add_output_ok $SESSION_NAME "net://localhost" "-n $name"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
                ok 0 "Custom name snapshot exists"
@@ -171,9 +187,7 @@ function test_ust_custom_name()
                out=1
        fi
 
-       diag "Killing $TESTAPP_NAME"
-       PID_APP=`pidof $TESTAPP_NAME`
-       kill $PID_APP >/dev/null 2>&1
+       stop_test_apps
 
        return $out
 }