-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
+# SPDX-License-Identifier: LGPL-2.1-only
#
-# This library 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 Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
SESSIOND_BIN="lttng-sessiond"
SESSIOND_MATCH=".*lttng-sess.*"
source $TESTDIR/utils/tap/tap.sh
-if [ -z $LTTNG_TEST_TEARDOWN_TIMEOUT ]; then
+if [ -z ${LTTNG_TEST_TEARDOWN_TIMEOUT+x} ]; then
LTTNG_TEST_TEARDOWN_TIMEOUT=60
fi
function lttng_track()
{
local expected_to_fail="$1"
+ shift 1
local opts="$@"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN track $opts >$OUTPUT_DEST
ret=$?
function lttng_untrack()
{
local expected_to_fail="$1"
+ shift 1
local opts="$@"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN untrack $opts >$OUTPUT_DEST
ret=$?
add_context_lttng 1 -k "$@"
}
-function validate_directory_empty ()
-{
- local trace_path=$1
-
- ls -A $local_path > /dev/null 2>&1
- if [ $? -eq 0 ]; then
- pass "Directory empty"
- else
- fail "Directory empty"
- fi
-}
-
function wait_live_trace_ready ()
{
local url=$1
return $ret
}
-function validate_folder_is_empty()
+function validate_directory_empty ()
{
- local folder=$1
+ local trace_path="$1"
+
+ # Do not double quote `$trace_path` below as we want wildcards to be
+ # expanded.
+ files="$(ls -A $trace_path)"
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ fail "Failed to list content of directory \"$trace_path\""
+ return $ret
+ fi
- test -z "$(ls -A "$folder")"
- ok $? "Folder ${folder} is empty"
+ nb_files="$(echo -n "$files" | wc -l)"
+ ok $nb_files "Directory \"$trace_path\" is empty"
}
function validate_trace_session_ust_empty()
{
- validate_folder_is_empty "$1"/ust
+ validate_directory_empty "$1"/ust
}
function validate_trace_session_kernel_empty()