From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Wed, 12 May 2021 15:09:37 +0000 (-0400)
Subject: Tests: move `list_triggers_matches_ok` to utils.sh
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=76404ef0a5abfd5151b2ba805cf142eb2b9d3c71;p=lttng-tools.git

Tests: move `list_triggers_matches_ok` to utils.sh

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I4cd3816fa7cbc1032582b2a99f67a3b14222f972
---

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 1ca35356e..7a6050fc8 100755
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -51,21 +51,6 @@ else
 fi
 
 
-function list_triggers_matches_ok ()
-{
-	local test_name="$1"
-	local expected_stdout_file="$2"
-
-	"${FULL_LTTNG_BIN}" list-triggers > "${tmp_stdout}" 2> "${tmp_stderr}"
-	ok $? "${test_name}: exit code is 0"
-
-	diff -u "${expected_stdout_file}" "${tmp_stdout}"
-	ok $? "${test_name}: expected stdout"
-
-	diff -u /dev/null "${tmp_stderr}"
-	ok $? "${test_name}: expected stderr"
-}
-
 test_top_level_options ()
 {
 	diag "Listing top level options"
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index f3b4c68c1..9ff25a0a5 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -2247,6 +2247,29 @@ function lttng_remove_trigger_ok()
 	lttng_remove_trigger 0 "$@"
 }
 
+function list_triggers_matches_ok ()
+{
+	local tmp_stdout=$(mktemp -t test_list_triggers_cli_stdout.XXXXXX)
+	local tmp_stderr=$(mktemp -t test_list_triggers_cli_stderr.XXXXXX)
+
+	local test_name="$1"
+	local expected_stdout_file="$2"
+
+	diag "$TESTDIR/../src/bin/lttng/$LTTNG_BIN list-triggers"
+
+	"$TESTDIR/../src/bin/lttng/$LTTNG_BIN" list-triggers > "${tmp_stdout}" 2> "${tmp_stderr}"
+	ok $? "${test_name}: exit code is 0"
+
+	diff -u "${expected_stdout_file}" "${tmp_stdout}"
+	ok $? "${test_name}: expected stdout"
+
+	diff -u /dev/null "${tmp_stderr}"
+	ok $? "${test_name}: expected stderr"
+
+	rm -f "${tmp_stdout}"
+	rm -f "${tmp_stderr}"
+}
+
 function validate_path_pattern ()
 {
 	local message=$1