X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=f05846f3e34bf0840b9c840aa821d97847db96f8;hb=31580dc77773c3319db9d28c22913c91b3325561;hp=e727aa6349f5075fcf04531374af08b9092c9571;hpb=1d20c959e3aa1a9a205fd7fff2d912b6bada1d23;p=lttng-tools.git diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test index e727aa634..f05846f3e 100755 --- a/tests/regression/tools/snapshots/ust_test +++ b/tests/regression/tools/snapshots/ust_test @@ -27,6 +27,7 @@ TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" NR_ITER=2000000 NR_USEC_WAIT=100 +APPS_PID= NUM_TESTS=76 @@ -48,11 +49,13 @@ NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2))) function start_test_app() { - local tmp_file="/tmp/lttng_test_ust.42.file" + local tmp_file=$(mktemp -u) # Start application with a temporary file. $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file & - ok $? "Start application to trace" + 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. @@ -63,11 +66,14 @@ function start_test_app() rm -f $tmp_file } -function kill_test_app() +function stop_test_apps() { - diag "Killing $TESTAPP_NAME" - PID_APP=`pidof $TESTAPP_NAME` - kill $PID_APP >/dev/null 2>&1 + diag "Stopping $TESTAPP_NAME" + for p in ${APPS_PID}; do + kill ${p} + wait ${p} 2>/dev/null + done + APPS_PID= } function snapshot_add_output () @@ -124,9 +130,9 @@ function test_ust_list_output () diag "Test UST snapshot output listing" 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 + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME + start_lttng_tracing_ok $SESSION_NAME snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" ${output_names[0]} @@ -143,8 +149,8 @@ function test_ust_list_output () ok $? "Snapshot named ${output_names[1]} present in list-output listing" - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME } function test_ust_local_snapshot () @@ -152,27 +158,25 @@ function test_ust_local_snapshot () diag "Test local UST snapshots" 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 - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app 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/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi - kill_test_app + stop_test_apps } function test_ust_local_snapshot_max_size () @@ -188,8 +192,8 @@ function test_ust_local_snapshot_max_size () enable_mmap_overwrite_subbuf_ust_channel $SESSION_NAME $CHANNEL_NAME $subbuf_size - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME snapshot_add_output $SESSION_NAME "file://$TRACE_PATH" "" $max_size @@ -209,8 +213,8 @@ function test_ust_local_snapshot_max_size () pass "Tracefiles size sum validation" - 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/ @@ -220,7 +224,7 @@ function test_ust_local_snapshot_max_size () rm -rf $TRACE_PATH fi - kill_test_app + stop_test_apps } function test_ust_local_snapshot_large_metadata () @@ -233,22 +237,20 @@ function test_ust_local_snapshot_large_metadata () diag "Test local UST snapshots with > 4kB metadata" create_lttng_session_no_output $SESSION_NAME enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $LM_EVENT $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH $LM_BIN 1 1 ok $? "Start application to trace" 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 $LM_EVENT $TRACE_PATH/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi } @@ -266,27 +268,25 @@ function test_ust_per_uid_local_snapshot () diag "Test local UST snapshots" create_lttng_session_no_output $SESSION_NAME enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app 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/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi - kill_test_app + stop_test_apps } function test_ust_per_uid_local_snapshot_post_mortem () @@ -294,25 +294,23 @@ function test_ust_per_uid_local_snapshot_post_mortem () diag "Test local UST snapshots post-mortem" create_lttng_session_no_output $SESSION_NAME enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME - start_lttng_tracing $SESSION_NAME - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app - kill_test_app + stop_test_apps 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/ if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi } @@ -321,9 +319,9 @@ function test_ust_local_snapshots () diag "Test $NR_SNAPSHOT local UST snapshots" 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 - lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME + start_lttng_tracing_ok $SESSION_NAME + lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH # Returns once the application has at least fired ONE tracepoint. start_test_app @@ -337,14 +335,12 @@ function test_ust_local_snapshots () if [ $? -eq 0 ]; then # Only delete if successful rm -rf $TRACE_PATH - else - break fi done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME - kill_test_app + stop_test_apps } plan_tests $NUM_TESTS