Tests: use _run_lttng_cmd instead of directly calling the client

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I1ad6601fb8cdf3b9ca973f1476c12bba2ff867cd

diff --git a/tests/perf/test_perf_raw.in b/tests/perf/test_perf_raw.in
index 00cdebc5567d1cccdc0ee9ddd13022040f382fc2..4a1ed1d800f4a0a7da22cf182d4418c57e82eda2 100644 (file)
--- a/tests/perf/test_perf_raw.in
+++ b/tests/perf/test_perf_raw.in
@@ -28,7 +28,9 @@ function enable_ust_lttng_event_per_chan()
        event_name="$2"
        chan_name="$3"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -c $chan_name -u >/dev/null 2>&1
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event "$event_name" --session "$sess_name"\
+               --channel "$chan_name" --userspace
        ok $? "Enable event $event_name for session $sess_name in channel $chan_name"
 }
 

diff --git a/tests/regression/kernel/test_rotation_destroy_flush b/tests/regression/kernel/test_rotation_destroy_flush
index fc22740262afd6ffe259ee26e768a56e65e46c26..70f73fda3d03e827343bfc9a5f23fb9aab2d4b73 100755 (executable)
--- a/tests/regression/kernel/test_rotation_destroy_flush
+++ b/tests/regression/kernel/test_rotation_destroy_flush
@@ -43,9 +43,10 @@ function enable_kernel_lttng_channel_size_limit ()
        test_name+="for session $sess_name: "
        test_name+="$tracefile_size_limit bytes tracefile limit"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
-           -k $channel_name -s $sess_name \
-           -C $tracefile_size_limit >/dev/null 2>&1
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-channel \
+               --kernel "$channel_name" --session "$sess_name" \
+               --tracefile-size $tracefile_size_limit
 
        ok $? "$test_name"
 }
@@ -60,8 +61,9 @@ function enable_kernel_lttng_event_per_channel ()
        test_name+="for session $sess_name "
        test_name+="in channel $channel_name"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" \
-           -s $sess_name -k -c $channel_name >/dev/null 2>&1
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event "$event_name" \
+               --session "$sess_name" --kernel --channel "$channel_name"
 
        ok $? "$test_name"
 }

diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
index 8f510f9c226787c5a707f8f52a119676ed3c49cb..69347a2b273c863b62c120db46ebcf82afd274c3 100755 (executable)
--- a/tests/regression/tools/exclusion/test_exclusion
+++ b/tests/regression/tools/exclusion/test_exclusion
@@ -26,7 +26,9 @@ function enable_ust_lttng_all_event_exclusion()
        sess_name="$1"
        exclusion="$2"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event -u "tp:*" -s $sess_name -x "$exclusion" > /dev/null
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event --userspace "tp:*" --session "$sess_name" \
+               --exclude "$exclusion"
 }
 
 function run_apps
@@ -46,7 +48,8 @@ function dry_run
        # Create session
        create_lttng_session_ok $SESSION_NAME $trace_path
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event -u "tp:*" -s $SESSION_NAME > /dev/null
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event --userspace "tp:*" --session "$SESSION_NAME"
        ok $? "Enabling events without exclusion"
 
        # Trace apps
@@ -158,7 +161,9 @@ function test_exclusion_fail
        exclusions="$2"
 
        create_lttng_session_ok $SESSION_NAME $trace_path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event -u "$event_name" -s $sess_name -x "$exclusions" >/dev/null 2>&1
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event --userspace "$event_name" --session "$sess_name" \
+               --exclude "$exclusions"
        res=$?
        destroy_lttng_session_ok $SESSION_NAME
 

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 2dd57b0bbbbcceb1339929b2fc44e63a5fa3120b..9089a402144c8e4e6a1d17b3d4854063b619794c 100755 (executable)
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -39,8 +39,9 @@ function enable_lttng_event_filter
        event_name="$3"
        filter="$4"
 
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name \
-               $domain --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" \
+               enable-event "$event_name" --session "$sess_name" \
+               "$domain" --filter "$filter"
 
        # Enable must fail
        if [ $? -eq 0 ]; then

diff --git a/tests/regression/tools/filtering/test_unsupported_op b/tests/regression/tools/filtering/test_unsupported_op
index 672a980de959d2494d81c1b40e1373a3af1d8d15..7d5e49cf2ac71d0cfcfc1068ee92eda3c0801d08 100755 (executable)
--- a/tests/regression/tools/filtering/test_unsupported_op
+++ b/tests/regression/tools/filtering/test_unsupported_op
@@ -11,7 +11,7 @@ CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 SESSION_NAME="filter-unsupported-ops"
 EVENT_NAME="bogus"
-ENABLE_EVENT_STDERR="/tmp/unsupported-ops-enable"
+ENABLE_EVENT_STDERR=$(mktemp -t tmp.test_filtering_unsupported_ops.XXXXXX)
 TRACE_PATH=$(mktemp -d -t tmp.test_filtering_unsupported_ops_trace_path.XXXXXX)
 NUM_GLOBAL_TESTS=2
 NUM_UST_TESTS=20
@@ -27,8 +27,8 @@ function enable_lttng_event_filter_unsupported
        event_name="$3"
        filter="$4"
 
-       enable_cmd="$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event"
-       $enable_cmd $event_name -s $sess_name $domain --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
+       _run_lttng_cmd '/dev/null' "$ENABLE_EVENT_STDERR" enable-event \
+               "$event_name" --session "$sess_name" "$domain" --filter "$filter"
 
        # Enable must fail
        if [ $? -eq 0 ]; then

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 04791e78a49ec98687412b411d2caf8d6dd3a1ab..f9f545bd4c3ab3f9e44ff590c9aeb8a330c8066a 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -664,7 +664,8 @@ function lttng_enable_kernel_userspace_probe_event ()
        local target="$3"
        local event_name="$4"
 
-       "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-event --kernel --userspace-probe="$target" "$event_name" -s "$sess_name" >"$(lttng_client_log_file)" 2>"$(lttng_client_err_file)"
+       _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" enable-event \
+               --kernel --userspace-probe="$target" "$event_name" --session "$sess_name"
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test $ret -ne "0"