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: wait output hide Terminate errors
[lttng-tools.git]
/
tests
/
regression
/
tools
/
live
/
test_kernel
diff --git
a/tests/regression/tools/live/test_kernel
b/tests/regression/tools/live/test_kernel
index ac4c19f56d8c7ff9b1a060363a801f7782cd0e01..4b958dff8ee6761d336b94beb248d2fd9a6a7078 100755
(executable)
--- a/
tests/regression/tools/live/test_kernel
+++ b/
tests/regression/tools/live/test_kernel
@@
-63,18
+63,16
@@
else
fi
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
fi
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --
daemonize
--quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+ $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --
background
--quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
if [ $? -eq 1 ]; then
echo "Fail to start lttng-sessiond"
exit 1
fi
if [ $? -eq 1 ]; then
echo "Fail to start lttng-sessiond"
exit 1
fi
- # Wait for sessiond to bootstrap
- sleep 2
fi
fi
-opt="-o $TRACE_PATH"
+opt="-
-background -
o $TRACE_PATH"
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1
&
+ $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1
if [ $? -eq 1 ]; then
echo "Fail to start lttng-relayd (opt: $opt)"
return 1
if [ $? -eq 1 ]; then
echo "Fail to start lttng-relayd (opt: $opt)"
return 1
@@
-90,7
+88,7
@@
clean_live_tracing
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
# Kill the relayd
PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD
>/dev/null 2>&1
+kill $PID_RELAYD
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
if [ $? -eq 1 ]; then
echo "Kill lttng-relayd (pid: $PID_RELAYD)"
exit 1
@@
-104,7
+102,7
@@
fi
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
# Kill the sessiond
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND
>/dev/null 2>&1
+kill $PID_SESSIOND
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
if [ $? -eq 1 ]; then
echo "Kill sessiond daemon"
exit 1
This page took
0.027039 seconds
and
4
git commands to generate.