Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / tests / regression / tools / tracefile-limits / test_tracefile_size

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index bbfc27c9e01ff25c383f8787a0879ce34b3d47be..489e68510f299a7cbe34e91a78ea7461da8b874e 100755 (executable)
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -85,7 +85,7 @@ function check_file_size ()
 function test_tracefile_size_limit ()
 {
        local size_limit="$1"
-       local trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+       local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
        local session_name=$(randstring 16 0)
        local channel_name="channel"
        local event_name="tp:tptest"
@@ -125,7 +125,7 @@ function test_tracefile_size_limit_pagesize ()
 {
        # Set a size limit lower than the page_size
        local size_limit="$(($PAGE_SIZE-2))"
-       local trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+       local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
        local session_name=$(randstring 16 0)
        local channel_name="channel"
        local event_name="tp:tptest"
@@ -164,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 
 # Test with multiples of PAGE_SIZE