projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: use --background for session daemon
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 968a6e61305ac92d1d633856027130f712584a5a..63b5eefed93ba728656da62fc21d5337bfec1338 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-16,6
+16,7
@@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
SESSIOND_BIN="lttng-sessiond"
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
SESSIOND_BIN="lttng-sessiond"
+CONSUMERD_BIN="lttng-consumerd"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
BABELTRACE_BIN="babeltrace"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
BABELTRACE_BIN="babeltrace"
@@
-156,7
+157,7
@@
function start_lttng_sessiond()
DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --
daemonize
--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
--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 --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
status=$?
ok $status "Start session daemon"
#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
status=$?
ok $status "Start session daemon"
@@
-183,6
+184,11
@@
function stop_lttng_sessiond ()
out=$(pidof lt-$SESSIOND_BIN)
sleep 0.5
done
out=$(pidof lt-$SESSIOND_BIN)
sleep 0.5
done
+ out=1
+ while [ -n "$out" ]; do
+ out=$(pidof $CONSUMERD_BIN)
+ sleep 0.5
+ done
pass "Kill session daemon"
fi
}
pass "Kill session daemon"
fi
}
This page took
0.023465 seconds
and
4
git commands to generate.