summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
485ca16)
Signed-off-by: Jonathan Rajotte Julien <jonathan.r.julien@gmail.com>
#Temp file output
OUTPUT_DIR=$(mktemp -d)
#Temp file output
OUTPUT_DIR=$(mktemp -d)
+FOO_LOAD_DIR=$(mktemp -d)
OUTPUT_FILE="default.xml"
#Path to custom xml utilities
OUTPUT_FILE="default.xml"
#Path to custom xml utilities
+start_lttng_sessiond $FOO_LOAD_DIR
TESTS=(
test_version
test_create_session
TESTS=(
test_version
test_create_session
+#First argument: load path for automatic loading
function start_lttng_sessiond()
{
function start_lttng_sessiond()
{
if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
# Env variable requested no session daemon
return
if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
# Env variable requested no session daemon
return
export LTTNG_SESSION_CONFIG_XSD_PATH
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
export LTTNG_SESSION_CONFIG_XSD_PATH
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $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"
+ # Have a load path ?
+ if [ -n "$1" ]; then
+ $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+ else
+ $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"
+ fi
#$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"