Fix: tests: don't use pidof to wait for test apps

[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 3aa38581eac519e56d368d568318d7c3a2760f6a..c0d98c2df1ff0dfb686b7ac7c23eb06ea8d9443c 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -31,7 +31,7 @@ NR_USEC_WAIT=100
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=39
+NUM_TESTS=49
 
 source $TESTDIR/utils/utils.sh
 
@@ -54,6 +54,33 @@ function snapshot_add_output ()
        ok $? "Added snapshot output $trace_path"
 }
 
+# Start trace application and return once one event has been hit.
+function start_trace_app()
+{
+       local tmp_file="/tmp/lttng_test_ust.42.file"
+
+       # Start application with a temporary file.
+       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
+       ok $? "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
+}
+
+function stop_trace_app()
+{
+       diag "Killing $TESTAPP_NAME"
+       PID_APP=`pidof $TESTAPP_NAME`
+       kill $PID_APP >/dev/null 2>&1
+       diag "Waiting on $TESTAPP_NAME"
+       wait
+}
+
 # Test a snapshot using a default name for the output destination.
 function test_ust_default_name_with_del()
 {
@@ -62,8 +89,9 @@ function test_ust_default_name_with_del()
        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"
+
+       start_trace_app
+
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
@@ -71,6 +99,7 @@ function test_ust_default_name_with_del()
        echo $TRACE_PATH/$HOSTNAME/snapshot-1
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
        if [ $? -ne 0 ]; then
+               stop_trace_app
                return $?
        fi
 
@@ -81,15 +110,14 @@ function test_ust_default_name_with_del()
        # 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_trace_app
                return $?
        fi
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
-       diag "Killing $TESTAPP_NAME"
-       PID_APP=`pidof $TESTAPP_NAME`
-       kill $PID_APP >/dev/null 2>&1
+       stop_trace_app
 
        return 0
 }
@@ -102,8 +130,9 @@ function test_ust_default_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"
+
+       start_trace_app
+
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME
@@ -112,9 +141,30 @@ function test_ust_default_name()
        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_trace_app
+
+       return $out
+}
+
+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
+
+       start_trace_app
+
+       snapshot_add_output $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
+       # Validate test
+       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
+       out=$?
+
+       stop_trace_app
 
        return $out
 }
@@ -130,8 +180,9 @@ function test_ust_custom_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"
+
+       start_trace_app
+
        snapshot_add_output $SESSION_NAME "net://localhost" $name
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing $SESSION_NAME
@@ -147,9 +198,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_trace_app
 
        return $out
 }
@@ -167,7 +216,7 @@ fi
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
 
-tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name )
+tests=( test_ust_default_name_with_del test_ust_default_name test_ust_custom_name test_ust_default_name_custom_uri )
 
 for fct_test in ${tests[@]};
 do