Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / ust / before-after / test_before_after

diff --git a/tests/regression/ust/before-after/test_before_after b/tests/regression/ust/before-after/test_before_after
index 66858517a6b38c2d7f18e7954d0f25c94e63b036..237e21b916bb5567c489faa2dcb36fc874738a3f 100755 (executable)
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -38,17 +38,18 @@ fi
 function test_before_apps()
 {
        # BEFORE application is spawned
 function test_before_apps()
 {
        # BEFORE application is spawned

-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+       start_lttng_tracing_ok $SESSION_NAME

 
 

-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT &
+       wait

        ok $? "Traced application stopped."
 
        ok $? "Traced application stopped."
 

-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME

 
 

-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH

 
        return $?
 }
 
        return $?
 }


@@ -56,19 +57,28 @@ function test_before_apps()
 function test_after_apps()
 {
        local out
 function test_after_apps()
 {
        local out

+       local file_sync_after_first=$(mktemp -u)
+       local file_sync_before_last=$(mktemp -u)

 
 

-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME

 
 

-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} &

        ok $? "Application started in background."
 
        ok $? "Application started in background."
 

-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME

 
 

-       wait ${!}
+       touch ${file_sync_before_last}

 
 

-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       wait
+
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
+
+       rm -f ${file_sync_after_first}
+       rm -f ${file_sync_before_last}

 
        validate_trace $EVENT_NAME $TRACE_PATH
        out=$?
 
        validate_trace $EVENT_NAME $TRACE_PATH
        out=$?