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
/
regression
/
tools
/
clear
/
test_ust
diff --git
a/tests/regression/tools/clear/test_ust
b/tests/regression/tools/clear/test_ust
index e121614d239ba00c42e434c570e51636079dd4fc..62a4804093c739a4e1acadef904f6dbe56a26f41 100755
(executable)
--- a/
tests/regression/tools/clear/test_ust
+++ b/
tests/regression/tools/clear/test_ust
@@
-223,7
+223,11
@@
function test_ust_streaming_live ()
do_clear_session $SESSION_NAME $tracing_active $clear_twice 0 0
stop_lttng_tracing_ok $SESSION_NAME
do_clear_session $SESSION_NAME $tracing_active $clear_twice 0 0
stop_lttng_tracing_ok $SESSION_NAME
- validate_directory_empty $local_path
+ if [[ "$buffer_type" == "uid" ]]; then
+ validate_trace_empty $local_path
+ else # pid
+ validate_directory_empty $local_path
+ fi
destroy_lttng_session_ok $SESSION_NAME
}
destroy_lttng_session_ok $SESSION_NAME
}
@@
-345,7
+349,10
@@
function test_ust_local ()
if [[ "$buffer_type" == "uid" ]]; then
validate_trace_empty $TRACE_PATH
else # pid
if [[ "$buffer_type" == "uid" ]]; then
validate_trace_empty $TRACE_PATH
else # pid
- validate_directory_empty $TRACE_PATH
+
+ # The sessiond always created a `ust/ directory
+ # whenever the UST domain is active
+ validate_directory_empty $TRACE_PATH/ust/
fi
fi
fi
fi
This page took
0.023415 seconds
and
4
git commands to generate.