projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: gen-ust-events-ns/tp.h: Fix build with musl libc
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index b326c5bcf94166358e341217078aa1721bb2c8e7..0583b5c1999b757595e430b1032b493851564136 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-139,10
+139,19
@@
function conf_proc_count()
# Bail out on failure
function validate_lttng_modules_present ()
{
# Bail out on failure
function validate_lttng_modules_present ()
{
+ # Check for loadable modules.
modprobe -n lttng-tracer 2>/dev/null
modprobe -n lttng-tracer 2>/dev/null
- if [ $? -
ne 0
]; then
- BAIL_OUT "LTTng modules not detected."
+ if [ $? -
eq 0
]; then
+ return 0
fi
fi
+
+ # Check for builtin modules.
+ ls /proc/lttng > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ return 0
+ fi
+
+ BAIL_OUT "LTTng modules not detected."
}
function enable_kernel_lttng_event
}
function enable_kernel_lttng_event
@@
-1860,7
+1869,9
@@
function validate_directory_empty ()
{
local trace_path="$1"
{
local trace_path="$1"
- files="$(ls -A "$trace_path")"
+ # 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\""
ret=$?
if [ $ret -ne 0 ]; then
fail "Failed to list content of directory \"$trace_path\""
This page took
0.025428 seconds
and
4
git commands to generate.