X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_add_trigger_cli;h=9ba8c22f0938055265d468f6ec6e871318a66c76;hb=091ab11bf62edc8f14ca36b5a3bcd6555257eb0e;hp=ecf04dd46589a20dbb60225063b42563c82a5c6d;hpb=b1a5fb96e7a9385fe421be9d4ab21a75ea11032f;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/test_add_trigger_cli b/tests/regression/tools/trigger/test_add_trigger_cli
index ecf04dd46..9ba8c22f0 100755
--- a/tests/regression/tools/trigger/test_add_trigger_cli
+++ b/tests/regression/tools/trigger/test_add_trigger_cli
@@ -23,15 +23,15 @@ TESTDIR="$CURDIR/../../.."
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
 
-plan_tests 286
+plan_tests 295
 
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 
 # shellcheck disable=SC2119
 start_lttng_sessiond_notap
 
-tmp_stdout=$(mktemp --tmpdir -t test_parse_cli_trigger_stdout.XXXXXX)
-tmp_stderr=$(mktemp --tmpdir -t test_parse_cli_trigger_stderr.XXXXXX)
+tmp_stdout=$(mktemp -t test_parse_cli_trigger_stdout.XXXXXX)
+tmp_stderr=$(mktemp -t test_parse_cli_trigger_stderr.XXXXXX)
 uprobe_elf_binary="${TESTDIR}/utils/testapp/userspace-probe-elf-binary/.libs/userspace-probe-elf-binary"
 
 if [ "$(id -u)" == "0" ]; then
@@ -47,10 +47,8 @@ function test_success ()
 	shift 2
 
 	diag "${FULL_LTTNG_BIN} add-trigger $*"
-	set -x
 	"${FULL_LTTNG_BIN}" add-trigger "$@" > "${tmp_stdout}" 2> "${tmp_stderr}"
 	ok $? "${test_name}: exit code is 0"
-	set +x
 
 	diff -u "${tmp_stdout}" <(echo "Added trigger \`$trigger_name\`.")
 	ok $? "${test_name}: expected stdout"
@@ -86,8 +84,8 @@ function test_mi ()
 	# the one used by the list command. Here we simply validate that a
 	# simple trigger is correctly generated.
 
-	tmp_stdout_raw=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
-	tmp_expected_stdout=$(mktemp --tmpdir -t "tmp.${FUNCNAME[0]}_expected_stdout.XXXXXX")
+	tmp_stdout_raw=$(mktemp -t "tmp.${FUNCNAME[0]}_stdout.XXXXXX")
+	tmp_expected_stdout=$(mktemp -t "tmp.${FUNCNAME[0]}_expected_stdout.XXXXXX")
 
 	diag "${FULL_LTTNG_BIN} --mi=xml add-trigger"
 
@@ -409,7 +407,7 @@ test_success "--action snapshot-session with ctrl/data URIs" "notify-15"\
 test_failure "no args" "Error: Missing --condition."
 
 test_failure "unknown option" \
-	"Error: While parsing argument #1 (\`--hello\`): Unknown option \`--hello\`" \
+	"Error: While parsing argument #2 (\`--hello\`): Unknown option \`--hello\`" \
 	--hello
 
 test_failure "missing --action" \
@@ -423,7 +421,7 @@ test_failure "two --condition" \
 	--action notify
 
 test_failure "missing argument to --name" \
-	"Error: While parsing argument #1 (\`--name\`): Missing required argument for option \`--name\`" \
+	"Error: While parsing argument #2 (\`--name\`): Missing required argument for option \`--name\`" \
 	--name
 
 for cmd in rate-policy=once-after rate-policy=every; do
@@ -450,11 +448,20 @@ test_failure "invalid argument to --rate-policy: unknown policy type" \
 
 # `--condition` failures
 test_failure "missing args after --condition" \
-	"Error: While parsing argument #1 (\`--condition\`): Missing required argument for option \`--condition\`" \
+	"Error: While parsing argument #2 (\`--condition\`): Missing required argument for option \`--condition\`
+Error: Valid condition names are:
+Error:   event-rule-matches" \
 	--condition
 test_failure "unknown --condition" \
-	"Error: Unknown condition name 'zoofest'" \
+	"Error: While parsing argument #2 (\`--condition\`): Unknown condition name 'zoofest'
+Error: Valid condition names are:
+Error:   event-rule-matches" \
 	--condition zoofest
+test_failure "unknown --condition=" \
+	"Error: While parsing argument #2 (\`--condition=zoofest\`): Unknown condition name 'zoofest'
+Error: Valid condition names are:
+Error:   event-rule-matches" \
+	--condition=zoofest
 
 # `--condition event-rule-matches` failures
 test_failure "missing args after --condition event-rule-matches" \
@@ -502,7 +509,7 @@ test_failure "--exclude-name with non-glob name" \
 	--action notify
 
 test_failure "--condition event-rule-matches --capture: missing argument (end of arg list)" \
-	'Error: While parsing argument #2 (`--capture`): Missing required argument for option `--capture`' \
+	'Error: While parsing argument #7 (`--capture`): Missing required argument for option `--capture`' \
 	--action notify \
 	--condition event-rule-matches --type=user --capture
 
@@ -548,10 +555,26 @@ test_failure "--condition event-rule-matches --capture: missing colon in app-spe
 
 # `--action` failures
 test_failure "missing args after --action" \
-	"Error: While parsing argument #1 (\`--action\`): Missing required argument for option \`--action\`" \
+	"Error: While parsing argument #5 (\`--action\`): Missing required argument for option \`--action\`
+Error: Valid action names are:
+Error:   notify" \
 	--condition event-rule-matches --type=user \
 	--action
 
+test_failure "unknown --action" \
+	"Error: While parsing argument #5 (\`--action\`): Unknown action name 'zoofest'
+Error: Valid action names are:
+Error:   notify" \
+	--condition event-rule-matches --type=user \
+	--action zoofest
+
+test_failure "unknown --action=" \
+	"Error: While parsing argument #5 (\`--action=zoofest\`): Unknown action name 'zoofest'
+Error: Valid action names are:
+Error:   notify" \
+	--condition event-rule-matches --type=user \
+	--action=zoofest
+
 # `--action notify` failures
 test_failure "extra arg after --action notify" \
 	"Error: Unexpected argument \`bob\`." \