projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Tests: utils.sh: merge `validate_{directory,folder_is}_empty` functions
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index d0f76bc6f678adff8375397f673b1e89d95162be..b326c5bcf94166358e341217078aa1721bb2c8e7 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-1604,18
+1604,6
@@
function add_context_kernel_fail()
add_context_lttng 1 -k "$@"
}
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
function wait_live_trace_ready ()
{
local url=$1
@@
-1868,17
+1856,24
@@
function validate_trace_empty()
return $ret
}
return $ret
}
-function validate_
folder_is_empty
()
+function validate_
directory_empty
()
{
{
- local folder=$1
+ local trace_path="$1"
+
+ 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()
{
}
function validate_trace_session_ust_empty()
{
- validate_
folder_is
_empty "$1"/ust
+ validate_
directory
_empty "$1"/ust
}
function validate_trace_session_kernel_empty()
}
function validate_trace_session_kernel_empty()
This page took
0.025414 seconds
and
4
git commands to generate.