Move to kernel style SPDX license identifiers

[babeltrace.git] / tests / cli / test_trimmer

diff --git a/tests/cli/test_trimmer b/tests/cli/test_trimmer
index d6155785cd467b96d41b22e6d64574d876088da3..c40db035c370fbb26269614c9a15c075f9799952 100755 (executable)
--- a/tests/cli/test_trimmer
+++ b/tests/cli/test_trimmer
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
-#
-# 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) 2017 Julien Desfossez <jdesfossez@efficios.com>
 #
-# 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
 
@@ -51,7 +41,7 @@ function expect_success()
        local msg="$2"
        shift 2
 
-       "${BT_TESTS_BT2_BIN}" "${TRACE_PATH}" "$@" 2>/dev/null > "${tmp_out}"
+       bt_cli "${tmp_out}" /dev/null "${TRACE_PATH}" "$@"
        ok $? "trimmer: ${msg}: exit status"
 
        num_events=$(wc -l < "${tmp_out}")
@@ -76,7 +66,7 @@ function expect_failure()
 
        # We check the error message logged by the trimmer plugin, set the env
        # var necessary for it to log errors.
-       BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL=E "${BT_TESTS_BT2_BIN}" "${TRACE_PATH}" "$@" 2> "${tmp_err}" > "${tmp_out}"
+       BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL=E bt_cli "${tmp_out}" "${tmp_err}" "${TRACE_PATH}" "$@"
        isnt $? 0 "trimmer: ${msg}: exit status"
 
        num_events=$(wc -l < "${tmp_out}")