common: move bt_component_class_type_string here, use it more

[babeltrace.git] / tests / cli / test_help

diff --git a/tests/cli/test_help b/tests/cli/test_help
index b867618e3b125f49453aaeb51204f68a878ae537..fb7cb59834adb78bb3e471b7f4071db454f6badc 100755 (executable)
--- a/tests/cli/test_help
+++ b/tests/cli/test_help
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 EfficiOS Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# Copyright (C) 2019 EfficiOS Inc.
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 SH_TAP=1
 
@@ -28,8 +18,8 @@ source "$UTILSSH"
 
 plan_tests 21
 
-stdout=$(mktemp test_help_stdout.XXXXXX)
-stderr=$(mktemp test_help_stderr.XXXXXX)
+stdout=$(mktemp -t test_help_stdout.XXXXXX)
+stderr=$(mktemp -t test_help_stderr.XXXXXX)
 
 # Return 0 if file "$1" exists and is empty, non-0 otherwise.
 
@@ -92,7 +82,7 @@ ok $? "help with unknown plugin name produces no output"
 bt_cli "${stdout}" "${stderr}" help src.ctf.bob
 isnt $? 0 "help with unknown component class name"
 
-grep --silent 'Cannot find component class: plugin-name="ctf", comp-cls-name="bob", comp-cls-type=0' "${stderr}"
+grep --silent 'Cannot find component class: plugin-name="ctf", comp-cls-name="bob", comp-cls-type=SOURCE' "${stderr}"
 ok $? "help with unknown component class name produces expected error"
 
 grep --silent 'Description: CTF input and output' "${stdout}"
@@ -107,3 +97,5 @@ ok $? "help with unknown component class plugin produces expected error"
 
 is_empty "${stdout}"
 ok $? "help with unknown component class plugin produces no output"
+
+rm -f "${stdout}" "${stderr}"