Refactor: test: wrapper for enable_ust_lttng_channel

[lttng-tools.git] / tests / regression / tools / snapshots / ust_test

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 1541e6e1e745b3272e318d76f47f0f4cdf6c3b9d..e839b84bfa364590e8fb054cbf3791939b3587bb 100755 (executable)
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -49,7 +49,7 @@ 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 &
@@ -174,8 +174,6 @@ function test_ust_local_snapshot ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 
        stop_test_apps
@@ -253,8 +251,6 @@ function test_ust_local_snapshot_large_metadata ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 }
 
@@ -288,8 +284,6 @@ function test_ust_per_uid_local_snapshot ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 
        stop_test_apps
@@ -317,8 +311,6 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 }
 
@@ -343,8 +335,6 @@ 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