* [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected
@ 2015-09-24 16:23 Mathieu Desnoyers
2015-09-24 16:23 ` [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests Mathieu Desnoyers
2015-09-24 18:45 ` [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Jérémie Galarneau
0 siblings, 2 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2015-09-24 16:23 UTC (permalink / raw)
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
---
tests/utils/utils.sh | 69 ++++++++++++++++++++++++++--------------------------
1 file changed, 35 insertions(+), 34 deletions(-)
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index aea2de8..9b1c872 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -20,7 +20,8 @@ CONSUMERD_BIN="lttng-consumerd"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
BABELTRACE_BIN="babeltrace"
-OUTPUT_DEST=/dev/null 2>&1
+OUTPUT_DEST=/dev/null
+ERROR_OUTPUT_DEST=/dev/null
# Minimal kernel version supported for session daemon tests
KERNEL_MAJOR_VERSION=2
@@ -103,7 +104,7 @@ function lttng_enable_kernel_event
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable kernel event $event_name for session $sess_name"
}
@@ -126,7 +127,7 @@ function lttng_enable_kernel_syscall()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
@@ -165,7 +166,7 @@ function lttng_disable_kernel_syscall()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
@@ -192,7 +193,7 @@ function lttng_enable_kernel_channel()
local sess_name=$2
local channel_name=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
@@ -218,7 +219,7 @@ function lttng_disable_kernel_channel()
local sess_name=$2
local channel_name=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
@@ -245,7 +246,7 @@ function start_lttng_relayd
DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >$OUTPUT_DEST
+ $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
fail "Start lttng-relayd (opt: $opt)"
@@ -263,7 +264,7 @@ function stop_lttng_relayd_nocheck
PID_RELAYD=`pidof lt-$RELAYD_BIN`
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
- kill $PID_RELAYD >$OUTPUT_DEST
+ kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
if [ $retval -eq 1 ]; then
@@ -331,7 +332,7 @@ function stop_lttng_sessiond ()
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
- kill $PID_SESSIOND >$OUTPUT_DEST
+ kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
if [ $? -eq 1 ]; then
fail "Kill sessions daemon"
@@ -354,7 +355,7 @@ function stop_lttng_sessiond ()
function list_lttng_with_opts ()
{
local opts=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Lttng-tool list command with option $opts"
}
@@ -362,7 +363,7 @@ function create_lttng_session_no_output ()
{
local sess_name=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Create session $sess_name in no-output mode"
}
@@ -388,7 +389,7 @@ function enable_ust_lttng_channel()
local channel_name=$2
local expect_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expect_fail ]]; then
test "$ret" -ne "0"
@@ -403,7 +404,7 @@ function disable_ust_lttng_channel()
local sess_name=$1
local channel_name=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Disable channel $channel_name for session $sess_name"
}
@@ -412,7 +413,7 @@ function enable_lttng_mmap_overwrite_kernel_channel()
local sess_name=$1
local channel_name=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable channel $channel_name for session $sess_name"
}
@@ -421,7 +422,7 @@ function enable_lttng_mmap_overwrite_ust_channel()
local sess_name=$1
local channel_name=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable channel $channel_name for session $sess_name"
}
@@ -439,7 +440,7 @@ function enable_ust_lttng_event ()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test $ret -ne "0"
@@ -462,7 +463,7 @@ function enable_jul_lttng_event()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable JUL event $event_name for session $sess_name"
}
@@ -480,7 +481,7 @@ function enable_jul_lttng_event_loglevel()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
}
@@ -497,7 +498,7 @@ function enable_log4j_lttng_event()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable LOG4J event $event_name for session $sess_name"
}
@@ -515,7 +516,7 @@ function enable_log4j_lttng_event_loglevel()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
}
@@ -525,7 +526,7 @@ function enable_ust_lttng_event_filter()
local event_name="$2"
local filter="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable event $event_name with filtering for session $sess_name"
}
@@ -535,7 +536,7 @@ function enable_ust_lttng_event_loglevel()
local event_name="$2"
local loglevel="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable event $event_name with loglevel $loglevel"
}
@@ -545,7 +546,7 @@ function enable_ust_lttng_event_loglevel_only()
local event_name="$2"
local loglevel="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Enable event $event_name with loglevel-only $loglevel"
}
@@ -562,7 +563,7 @@ function disable_ust_lttng_event ()
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Disable event $event_name for session $sess_name"
}
@@ -589,7 +590,7 @@ function start_lttng_tracing ()
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@ -604,7 +605,7 @@ function stop_lttng_tracing ()
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@ -619,7 +620,7 @@ function destroy_lttng_session ()
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@ -631,7 +632,7 @@ function destroy_lttng_session ()
function destroy_lttng_sessions ()
{
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Destroy all lttng sessions"
}
@@ -641,7 +642,7 @@ function lttng_snapshot_add_output ()
local trace_path=$2
local expected_to_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@ -657,7 +658,7 @@ function lttng_snapshot_del_output ()
local id=$2
local expected_to_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@ -672,14 +673,14 @@ function lttng_snapshot_record ()
local sess_name=$1
local trace_path=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Snapshot recorded"
}
function lttng_snapshot_list ()
{
local sess_name=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Snapshot list"
}
@@ -688,7 +689,7 @@ function lttng_save()
local sess_name=$1
local opts=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Session successfully saved"
}
@@ -696,7 +697,7 @@ function lttng_load()
{
local opts=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >$OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ok $? "Load command successful"
}
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests
2015-09-24 16:23 [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Mathieu Desnoyers
@ 2015-09-24 16:23 ` Mathieu Desnoyers
2015-09-24 18:45 ` Jérémie Galarneau
2015-09-24 18:45 ` [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Jérémie Galarneau
1 sibling, 1 reply; 4+ messages in thread
From: Mathieu Desnoyers @ 2015-09-24 16:23 UTC (permalink / raw)
Fix racy session/relayd wait-after-kill scheme.
Fix racy live test where application may not have generated events yet
when we attach to the live trace.
Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
---
tests/regression/tools/health/test_health.sh | 4 +-
tests/regression/tools/live/test_kernel | 47 +---------
tests/regression/tools/live/test_ust | 60 ++++--------
.../regression/tools/live/test_ust_tracefile_count | 60 ++++--------
tests/regression/tools/save-load/test_load | 6 +-
tests/utils/utils.sh | 103 ++++++++++++++++-----
6 files changed, 120 insertions(+), 160 deletions(-)
diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 6ae8885..ddc104c 100644
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -146,7 +146,9 @@ function test_health
fi
if [ ${test_relayd} -eq 1 ]; then
- stop_lttng_relayd_nocheck
+ # We may fail to stop relayd here, and this is OK, since
+ # it may have been killed volountarily by testpoint.
+ stop_lttng_relayd_notap
fi
stop_lttng_sessiond
diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
index 4b958df..0e542da 100755
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -62,22 +62,8 @@ else
exit 0
fi
-if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $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
-fi
-
-opt="--background -o $TRACE_PATH"
-if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $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
- fi
-fi
+start_lttng_sessiond_notap
+start_lttng_relayd_notap "-o $TRACE_PATH"
setup_live_tracing
@@ -86,30 +72,5 @@ $TESTDIR/regression/tools/live/live_test
clean_live_tracing
-# Kill the relayd
-PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD
-if [ $? -eq 1 ]; then
- echo "Kill lttng-relayd (pid: $PID_RELAYD)"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$RELAYD_BIN)
- sleep 0.5
- done
-fi
-
-# Kill the sessiond
-PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND
-if [ $? -eq 1 ]; then
- echo "Kill sessiond daemon"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$SESSIOND_BIN)
- sleep 0.5
- done
-fi
+stop_lttng_relayd_notap
+stop_lttng_sessiond_notap
diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust
index ae69195..0b96858 100755
--- a/tests/regression/tools/live/test_ust
+++ b/tests/regression/tools/live/test_ust
@@ -59,57 +59,29 @@ function clean_live_tracing()
rm -rf $TRACE_PATH
}
-if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $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
-fi
-
-opt="-o $TRACE_PATH --background"
-if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $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
- fi
-fi
+file_sync_after_first=$(mktemp -u)
+
+start_lttng_sessiond_notap
+start_lttng_relayd_notap "-o $TRACE_PATH"
setup_live_tracing
# Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
+
+while [ ! -f "${file_sync_after_first}" ]; do
+ sleep 0.5
+done
# Start the live test
$TESTDIR/regression/tools/live/live_test
+# Wait for the applications started in background
+wait
+
clean_live_tracing
-# Kill the relayd
-PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD
-if [ $? -eq 1 ]; then
- echo "Kill lttng-relayd (pid: $PID_RELAYD)"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$RELAYD_BIN)
- sleep 0.5
- done
-fi
-
-# Kill the sessiond
-PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND
-if [ $? -eq 1 ]; then
- echo "Kill sessiond daemon"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$SESSIOND_BIN)
- sleep 0.5
- done
-fi
+rm -f ${file_sync_after_first}
+
+stop_lttng_relayd_notap
+stop_lttng_sessiond_notap
diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count
index 68e3722..54d6a52 100755
--- a/tests/regression/tools/live/test_ust_tracefile_count
+++ b/tests/regression/tools/live/test_ust_tracefile_count
@@ -60,57 +60,29 @@ function clean_live_tracing()
rm -rf $TRACE_PATH
}
-if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
- $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
-fi
-
-opt="-o $TRACE_PATH --background"
-if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $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
- fi
-fi
+file_sync_after_first=$(mktemp -u)
+
+start_lttng_sessiond_notap
+start_lttng_relayd_notap "-o $TRACE_PATH"
setup_live_tracing
# Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
+
+while [ ! -f "${file_sync_after_first}" ]; do
+ sleep 0.5
+done
# Start the live test
$TESTDIR/regression/tools/live/live_test
+# Wait for the applications started in background
+wait
+
clean_live_tracing
-# Kill the relayd
-PID_RELAYD=`pidof lt-$RELAYD_BIN`
-kill $PID_RELAYD
-if [ $? -eq 1 ]; then
- echo "Kill lttng-relayd (pid: $PID_RELAYD)"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$RELAYD_BIN)
- sleep 0.5
- done
-fi
-
-# Kill the sessiond
-PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
-kill $PID_SESSIOND
-if [ $? -eq 1 ]; then
- echo "Kill sessiond daemon"
- exit 1
-else
- out=1
- while [ -n "$out" ]; do
- out=$(pidof lt-$SESSIOND_BIN)
- sleep 0.5
- done
-fi
+rm -f ${file_sync_after_first}
+
+stop_lttng_relayd_notap
+stop_lttng_sessiond_notap
diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 6b892cf..fc07924 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -29,7 +29,7 @@ EVENT_NAME="tp:tptest"
DIR=$(readlink -f $TESTDIR)
-NUM_TESTS=21
+NUM_TESTS=23
source $TESTDIR/utils/utils.sh
@@ -92,7 +92,7 @@ function test_complex_load()
fi
destroy_lttng_session $sess
- stop_lttng_relayd_nocheck
+ stop_lttng_relayd
}
function test_all_load()
@@ -108,7 +108,7 @@ function test_all_load()
destroy_lttng_session $SESSION_NAME
destroy_lttng_session "$SESSION_NAME-complex"
- stop_lttng_relayd_nocheck
+ stop_lttng_relayd
}
function test_overwrite()
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 9b1c872..621db33 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -239,9 +239,10 @@ function lttng_disable_kernel_channel_fail()
lttng_disable_kernel_channel 1 ${*}
}
-function start_lttng_relayd
+function start_lttng_relayd_opt()
{
- local opt=$1
+ local withtap=$1
+ local opt=$2
DIR=$(readlink -f $TESTDIR)
@@ -249,52 +250,77 @@ function start_lttng_relayd
$DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
- fail "Start lttng-relayd (opt: $opt)"
+ if [ $withtap -eq "1" ]; then
+ fail "Start lttng-relayd (opt: $opt)"
+ fi
return 1
else
- pass "Start lttng-relayd (opt: $opt)"
+ if [ $withtap -eq "1" ]; then
+ pass "Start lttng-relayd (opt: $opt)"
+ fi
fi
else
pass "Start lttng-relayd (opt: $opt)"
fi
}
-function stop_lttng_relayd_nocheck
+function start_lttng_relayd()
{
+ start_lttng_relayd_opt 1 "$@"
+}
+
+function start_lttng_relayd_notap()
+{
+ start_lttng_relayd_opt 0 "$@"
+}
+
+function stop_lttng_relayd_opt()
+{
+ local withtap=$1
+
PID_RELAYD=`pidof lt-$RELAYD_BIN`
- diag "Killing lttng-relayd (pid: $PID_RELAYD)"
+ if [ $withtap -eq "1" ]; then
+ diag "Killing lttng-relayd (pid: $PID_RELAYD)"
+ fi
kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
- if [ $retval -eq 1 ]; then
+ if [ $? -eq 1 ]; then
+ if [ $withtap -eq "1" ]; then
+ fail "Kill relay daemon"
+ fi
+ return 1
+ else
out=1
while [ -n "$out" ]; do
out=$(pidof lt-$RELAYD_BIN)
sleep 0.5
done
+ if [ $withtap -eq "1" ]; then
+ pass "Kill relay daemon"
+ fi
fi
return $retval
}
-function stop_lttng_relayd
+function stop_lttng_relayd()
{
- stop_lttng_relayd_nocheck
+ stop_lttng_relayd_opt 1 "$@"
+}
- if [ $? -eq 1 ]; then
- fail "Killed lttng-relayd (pid: $PID_RELAYD)"
- return 1
- else
- pass "Killed lttng-relayd (pid: $PID_RELAYD)"
- return 0
- fi
+function stop_lttng_relayd_notap()
+{
+ stop_lttng_relayd_opt 0 "$@"
}
-#First argument: load path for automatic loading
-function start_lttng_sessiond()
+#First arg: show tap output
+#Second argument: load path for automatic loading
+function start_lttng_sessiond_opt()
{
+ local withtap=$1
+ local load_path=$2
- local load_path="$1"
if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
# Env variable requested no session daemon
return
@@ -312,19 +338,33 @@ function start_lttng_sessiond()
if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
# Have a load path ?
- if [ -n "$1" ]; then
+ if [ -n "$load_path" ]; 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 --background --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"
+ if [ $withtap -eq "1" ]; then
+ ok $status "Start session daemon"
+ fi
fi
}
-function stop_lttng_sessiond ()
+function start_lttng_sessiond()
+{
+ start_lttng_sessiond_opt 1 "$@"
+}
+
+function start_lttng_sessiond_notap()
{
+ start_lttng_sessiond_opt 0 "$@"
+}
+
+function stop_lttng_sessiond_opt()
+{
+ local withtap=$1
+
if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
# Env variable requested no session daemon
return
@@ -335,8 +375,9 @@ function stop_lttng_sessiond ()
kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
if [ $? -eq 1 ]; then
- fail "Kill sessions daemon"
- return 1
+ if [ $withtap -eq "1" ]; then
+ fail "Kill sessions daemon"
+ fi
else
out=1
while [ -n "$out" ]; do
@@ -348,10 +389,22 @@ function stop_lttng_sessiond ()
out=$(pidof $CONSUMERD_BIN)
sleep 0.5
done
- pass "Kill session daemon"
+ if [ $withtap -eq "1" ]; then
+ pass "Kill session daemon"
+ fi
fi
}
+function stop_lttng_sessiond()
+{
+ stop_lttng_sessiond_opt 1 "$@"
+}
+
+function stop_lttng_sessiond_notap()
+{
+ stop_lttng_sessiond_opt 0 "$@"
+}
+
function list_lttng_with_opts ()
{
local opts=$1
--
2.1.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected
2015-09-24 16:23 [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Mathieu Desnoyers
2015-09-24 16:23 ` [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests Mathieu Desnoyers
@ 2015-09-24 18:45 ` Jérémie Galarneau
1 sibling, 0 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2015-09-24 18:45 UTC (permalink / raw)
Merged, thanks!
J?r?mie
On Thu, Sep 24, 2015 at 12:23 PM, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
> tests/utils/utils.sh | 69 ++++++++++++++++++++++++++--------------------------
> 1 file changed, 35 insertions(+), 34 deletions(-)
>
> diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
> index aea2de8..9b1c872 100644
> --- a/tests/utils/utils.sh
> +++ b/tests/utils/utils.sh
> @@ -20,7 +20,8 @@ CONSUMERD_BIN="lttng-consumerd"
> RELAYD_BIN="lttng-relayd"
> LTTNG_BIN="lttng"
> BABELTRACE_BIN="babeltrace"
> -OUTPUT_DEST=/dev/null 2>&1
> +OUTPUT_DEST=/dev/null
> +ERROR_OUTPUT_DEST=/dev/null
>
> # Minimal kernel version supported for session daemon tests
> KERNEL_MAJOR_VERSION=2
> @@ -103,7 +104,7 @@ function lttng_enable_kernel_event
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable kernel event $event_name for session $sess_name"
> }
>
> @@ -126,7 +127,7 @@ function lttng_enable_kernel_syscall()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail -eq "1" ]]; then
> test $ret -ne "0"
> @@ -165,7 +166,7 @@ function lttng_disable_kernel_syscall()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
>
> ret=$?
> if [[ $expected_to_fail -eq "1" ]]; then
> @@ -192,7 +193,7 @@ function lttng_enable_kernel_channel()
> local sess_name=$2
> local channel_name=$3
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail -eq "1" ]]; then
> test "$ret" -ne "0"
> @@ -218,7 +219,7 @@ function lttng_disable_kernel_channel()
> local sess_name=$2
> local channel_name=$3
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail -eq "1" ]]; then
> test "$ret" -ne "0"
> @@ -245,7 +246,7 @@ function start_lttng_relayd
> DIR=$(readlink -f $TESTDIR)
>
> if [ -z $(pidof lt-$RELAYD_BIN) ]; then
> - $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt >$OUTPUT_DEST
> + $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
> if [ $? -eq 1 ]; then
> fail "Start lttng-relayd (opt: $opt)"
> @@ -263,7 +264,7 @@ function stop_lttng_relayd_nocheck
> PID_RELAYD=`pidof lt-$RELAYD_BIN`
>
> diag "Killing lttng-relayd (pid: $PID_RELAYD)"
> - kill $PID_RELAYD >$OUTPUT_DEST
> + kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> retval=$?
>
> if [ $retval -eq 1 ]; then
> @@ -331,7 +332,7 @@ function stop_lttng_sessiond ()
>
> PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
>
> - kill $PID_SESSIOND >$OUTPUT_DEST
> + kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
>
> if [ $? -eq 1 ]; then
> fail "Kill sessions daemon"
> @@ -354,7 +355,7 @@ function stop_lttng_sessiond ()
> function list_lttng_with_opts ()
> {
> local opts=$1
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Lttng-tool list command with option $opts"
> }
>
> @@ -362,7 +363,7 @@ function create_lttng_session_no_output ()
> {
> local sess_name=$1
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Create session $sess_name in no-output mode"
> }
>
> @@ -388,7 +389,7 @@ function enable_ust_lttng_channel()
> local channel_name=$2
> local expect_fail=$3
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expect_fail ]]; then
> test "$ret" -ne "0"
> @@ -403,7 +404,7 @@ function disable_ust_lttng_channel()
> local sess_name=$1
> local channel_name=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Disable channel $channel_name for session $sess_name"
> }
>
> @@ -412,7 +413,7 @@ function enable_lttng_mmap_overwrite_kernel_channel()
> local sess_name=$1
> local channel_name=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable channel $channel_name for session $sess_name"
> }
>
> @@ -421,7 +422,7 @@ function enable_lttng_mmap_overwrite_ust_channel()
> local sess_name=$1
> local channel_name=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable channel $channel_name for session $sess_name"
> }
>
> @@ -439,7 +440,7 @@ function enable_ust_lttng_event ()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test $ret -ne "0"
> @@ -462,7 +463,7 @@ function enable_jul_lttng_event()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable JUL event $event_name for session $sess_name"
> }
>
> @@ -480,7 +481,7 @@ function enable_jul_lttng_event_loglevel()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
> }
>
> @@ -497,7 +498,7 @@ function enable_log4j_lttng_event()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable LOG4J event $event_name for session $sess_name"
> }
>
> @@ -515,7 +516,7 @@ function enable_log4j_lttng_event_loglevel()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
> }
>
> @@ -525,7 +526,7 @@ function enable_ust_lttng_event_filter()
> local event_name="$2"
> local filter="$3"
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter" 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable event $event_name with filtering for session $sess_name"
> }
>
> @@ -535,7 +536,7 @@ function enable_ust_lttng_event_loglevel()
> local event_name="$2"
> local loglevel="$3"
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable event $event_name with loglevel $loglevel"
> }
>
> @@ -545,7 +546,7 @@ function enable_ust_lttng_event_loglevel_only()
> local event_name="$2"
> local loglevel="$3"
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Enable event $event_name with loglevel-only $loglevel"
> }
>
> @@ -562,7 +563,7 @@ function disable_ust_lttng_event ()
> chan="-c $channel_name"
> fi
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Disable event $event_name for session $sess_name"
> }
>
> @@ -589,7 +590,7 @@ function start_lttng_tracing ()
> local sess_name=$1
> local expected_to_fail=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test "$ret" -ne "0"
> @@ -604,7 +605,7 @@ function stop_lttng_tracing ()
> local sess_name=$1
> local expected_to_fail=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test "$ret" -ne "0"
> @@ -619,7 +620,7 @@ function destroy_lttng_session ()
> local sess_name=$1
> local expected_to_fail=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test "$ret" -ne "0"
> @@ -631,7 +632,7 @@ function destroy_lttng_session ()
>
> function destroy_lttng_sessions ()
> {
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Destroy all lttng sessions"
> }
>
> @@ -641,7 +642,7 @@ function lttng_snapshot_add_output ()
> local trace_path=$2
> local expected_to_fail=$3
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test "$ret" -ne "0"
> @@ -657,7 +658,7 @@ function lttng_snapshot_del_output ()
> local id=$2
> local expected_to_fail=$3
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ret=$?
> if [[ $expected_to_fail ]]; then
> test "$ret" -ne "0"
> @@ -672,14 +673,14 @@ function lttng_snapshot_record ()
> local sess_name=$1
> local trace_path=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Snapshot recorded"
> }
>
> function lttng_snapshot_list ()
> {
> local sess_name=$1
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Snapshot list"
> }
>
> @@ -688,7 +689,7 @@ function lttng_save()
> local sess_name=$1
> local opts=$2
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Session successfully saved"
> }
>
> @@ -696,7 +697,7 @@ function lttng_load()
> {
> local opts=$1
>
> - $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts >$OUTPUT_DEST
> + $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> ok $? "Load command successful"
> }
>
> --
> 2.1.4
>
--
J?r?mie Galarneau
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests
2015-09-24 16:23 ` [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests Mathieu Desnoyers
@ 2015-09-24 18:45 ` Jérémie Galarneau
0 siblings, 0 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2015-09-24 18:45 UTC (permalink / raw)
Merged, thanks!
J?r?mie
On Thu, Sep 24, 2015 at 12:23 PM, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> Fix racy session/relayd wait-after-kill scheme.
> Fix racy live test where application may not have generated events yet
> when we attach to the live trace.
>
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
> tests/regression/tools/health/test_health.sh | 4 +-
> tests/regression/tools/live/test_kernel | 47 +---------
> tests/regression/tools/live/test_ust | 60 ++++--------
> .../regression/tools/live/test_ust_tracefile_count | 60 ++++--------
> tests/regression/tools/save-load/test_load | 6 +-
> tests/utils/utils.sh | 103 ++++++++++++++++-----
> 6 files changed, 120 insertions(+), 160 deletions(-)
>
> diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
> index 6ae8885..ddc104c 100644
> --- a/tests/regression/tools/health/test_health.sh
> +++ b/tests/regression/tools/health/test_health.sh
> @@ -146,7 +146,9 @@ function test_health
> fi
>
> if [ ${test_relayd} -eq 1 ]; then
> - stop_lttng_relayd_nocheck
> + # We may fail to stop relayd here, and this is OK, since
> + # it may have been killed volountarily by testpoint.
> + stop_lttng_relayd_notap
> fi
> stop_lttng_sessiond
>
> diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
> index 4b958df..0e542da 100755
> --- a/tests/regression/tools/live/test_kernel
> +++ b/tests/regression/tools/live/test_kernel
> @@ -62,22 +62,8 @@ else
> exit 0
> fi
>
> -if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
> - $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
> -fi
> -
> -opt="--background -o $TRACE_PATH"
> -if [ -z $(pidof lt-$RELAYD_BIN) ]; then
> - $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
> - fi
> -fi
> +start_lttng_sessiond_notap
> +start_lttng_relayd_notap "-o $TRACE_PATH"
>
> setup_live_tracing
>
> @@ -86,30 +72,5 @@ $TESTDIR/regression/tools/live/live_test
>
> clean_live_tracing
>
> -# Kill the relayd
> -PID_RELAYD=`pidof lt-$RELAYD_BIN`
> -kill $PID_RELAYD
> -if [ $? -eq 1 ]; then
> - echo "Kill lttng-relayd (pid: $PID_RELAYD)"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$RELAYD_BIN)
> - sleep 0.5
> - done
> -fi
> -
> -# Kill the sessiond
> -PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
> -kill $PID_SESSIOND
> -if [ $? -eq 1 ]; then
> - echo "Kill sessiond daemon"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$SESSIOND_BIN)
> - sleep 0.5
> - done
> -fi
> +stop_lttng_relayd_notap
> +stop_lttng_sessiond_notap
> diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust
> index ae69195..0b96858 100755
> --- a/tests/regression/tools/live/test_ust
> +++ b/tests/regression/tools/live/test_ust
> @@ -59,57 +59,29 @@ function clean_live_tracing()
> rm -rf $TRACE_PATH
> }
>
> -if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
> - $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
> -fi
> -
> -opt="-o $TRACE_PATH --background"
> -if [ -z $(pidof lt-$RELAYD_BIN) ]; then
> - $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
> - fi
> -fi
> +file_sync_after_first=$(mktemp -u)
> +
> +start_lttng_sessiond_notap
> +start_lttng_relayd_notap "-o $TRACE_PATH"
>
> setup_live_tracing
>
> # Run app in background
> -$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
> +$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
> +
> +while [ ! -f "${file_sync_after_first}" ]; do
> + sleep 0.5
> +done
>
> # Start the live test
> $TESTDIR/regression/tools/live/live_test
>
> +# Wait for the applications started in background
> +wait
> +
> clean_live_tracing
>
> -# Kill the relayd
> -PID_RELAYD=`pidof lt-$RELAYD_BIN`
> -kill $PID_RELAYD
> -if [ $? -eq 1 ]; then
> - echo "Kill lttng-relayd (pid: $PID_RELAYD)"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$RELAYD_BIN)
> - sleep 0.5
> - done
> -fi
> -
> -# Kill the sessiond
> -PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
> -kill $PID_SESSIOND
> -if [ $? -eq 1 ]; then
> - echo "Kill sessiond daemon"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$SESSIOND_BIN)
> - sleep 0.5
> - done
> -fi
> +rm -f ${file_sync_after_first}
> +
> +stop_lttng_relayd_notap
> +stop_lttng_sessiond_notap
> diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count
> index 68e3722..54d6a52 100755
> --- a/tests/regression/tools/live/test_ust_tracefile_count
> +++ b/tests/regression/tools/live/test_ust_tracefile_count
> @@ -60,57 +60,29 @@ function clean_live_tracing()
> rm -rf $TRACE_PATH
> }
>
> -if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
> - $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
> -fi
> -
> -opt="-o $TRACE_PATH --background"
> -if [ -z $(pidof lt-$RELAYD_BIN) ]; then
> - $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
> - fi
> -fi
> +file_sync_after_first=$(mktemp -u)
> +
> +start_lttng_sessiond_notap
> +start_lttng_relayd_notap "-o $TRACE_PATH"
>
> setup_live_tracing
>
> # Run app in background
> -$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
> +$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
> +
> +while [ ! -f "${file_sync_after_first}" ]; do
> + sleep 0.5
> +done
>
> # Start the live test
> $TESTDIR/regression/tools/live/live_test
>
> +# Wait for the applications started in background
> +wait
> +
> clean_live_tracing
>
> -# Kill the relayd
> -PID_RELAYD=`pidof lt-$RELAYD_BIN`
> -kill $PID_RELAYD
> -if [ $? -eq 1 ]; then
> - echo "Kill lttng-relayd (pid: $PID_RELAYD)"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$RELAYD_BIN)
> - sleep 0.5
> - done
> -fi
> -
> -# Kill the sessiond
> -PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
> -kill $PID_SESSIOND
> -if [ $? -eq 1 ]; then
> - echo "Kill sessiond daemon"
> - exit 1
> -else
> - out=1
> - while [ -n "$out" ]; do
> - out=$(pidof lt-$SESSIOND_BIN)
> - sleep 0.5
> - done
> -fi
> +rm -f ${file_sync_after_first}
> +
> +stop_lttng_relayd_notap
> +stop_lttng_sessiond_notap
> diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
> index 6b892cf..fc07924 100755
> --- a/tests/regression/tools/save-load/test_load
> +++ b/tests/regression/tools/save-load/test_load
> @@ -29,7 +29,7 @@ EVENT_NAME="tp:tptest"
>
> DIR=$(readlink -f $TESTDIR)
>
> -NUM_TESTS=21
> +NUM_TESTS=23
>
> source $TESTDIR/utils/utils.sh
>
> @@ -92,7 +92,7 @@ function test_complex_load()
> fi
> destroy_lttng_session $sess
>
> - stop_lttng_relayd_nocheck
> + stop_lttng_relayd
> }
>
> function test_all_load()
> @@ -108,7 +108,7 @@ function test_all_load()
> destroy_lttng_session $SESSION_NAME
> destroy_lttng_session "$SESSION_NAME-complex"
>
> - stop_lttng_relayd_nocheck
> + stop_lttng_relayd
> }
>
> function test_overwrite()
> diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
> index 9b1c872..621db33 100644
> --- a/tests/utils/utils.sh
> +++ b/tests/utils/utils.sh
> @@ -239,9 +239,10 @@ function lttng_disable_kernel_channel_fail()
> lttng_disable_kernel_channel 1 ${*}
> }
>
> -function start_lttng_relayd
> +function start_lttng_relayd_opt()
> {
> - local opt=$1
> + local withtap=$1
> + local opt=$2
>
> DIR=$(readlink -f $TESTDIR)
>
> @@ -249,52 +250,77 @@ function start_lttng_relayd
> $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
> if [ $? -eq 1 ]; then
> - fail "Start lttng-relayd (opt: $opt)"
> + if [ $withtap -eq "1" ]; then
> + fail "Start lttng-relayd (opt: $opt)"
> + fi
> return 1
> else
> - pass "Start lttng-relayd (opt: $opt)"
> + if [ $withtap -eq "1" ]; then
> + pass "Start lttng-relayd (opt: $opt)"
> + fi
> fi
> else
> pass "Start lttng-relayd (opt: $opt)"
> fi
> }
>
> -function stop_lttng_relayd_nocheck
> +function start_lttng_relayd()
> {
> + start_lttng_relayd_opt 1 "$@"
> +}
> +
> +function start_lttng_relayd_notap()
> +{
> + start_lttng_relayd_opt 0 "$@"
> +}
> +
> +function stop_lttng_relayd_opt()
> +{
> + local withtap=$1
> +
> PID_RELAYD=`pidof lt-$RELAYD_BIN`
>
> - diag "Killing lttng-relayd (pid: $PID_RELAYD)"
> + if [ $withtap -eq "1" ]; then
> + diag "Killing lttng-relayd (pid: $PID_RELAYD)"
> + fi
> kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
> retval=$?
>
> - if [ $retval -eq 1 ]; then
> + if [ $? -eq 1 ]; then
> + if [ $withtap -eq "1" ]; then
> + fail "Kill relay daemon"
> + fi
> + return 1
> + else
> out=1
> while [ -n "$out" ]; do
> out=$(pidof lt-$RELAYD_BIN)
> sleep 0.5
> done
> + if [ $withtap -eq "1" ]; then
> + pass "Kill relay daemon"
> + fi
> fi
> return $retval
> }
>
> -function stop_lttng_relayd
> +function stop_lttng_relayd()
> {
> - stop_lttng_relayd_nocheck
> + stop_lttng_relayd_opt 1 "$@"
> +}
>
> - if [ $? -eq 1 ]; then
> - fail "Killed lttng-relayd (pid: $PID_RELAYD)"
> - return 1
> - else
> - pass "Killed lttng-relayd (pid: $PID_RELAYD)"
> - return 0
> - fi
> +function stop_lttng_relayd_notap()
> +{
> + stop_lttng_relayd_opt 0 "$@"
> }
>
> -#First argument: load path for automatic loading
> -function start_lttng_sessiond()
> +#First arg: show tap output
> +#Second argument: load path for automatic loading
> +function start_lttng_sessiond_opt()
> {
> + local withtap=$1
> + local load_path=$2
>
> - local load_path="$1"
> if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
> # Env variable requested no session daemon
> return
> @@ -312,19 +338,33 @@ function start_lttng_sessiond()
>
> if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
> # Have a load path ?
> - if [ -n "$1" ]; then
> + if [ -n "$load_path" ]; 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 --background --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"
> + if [ $withtap -eq "1" ]; then
> + ok $status "Start session daemon"
> + fi
> fi
> }
>
> -function stop_lttng_sessiond ()
> +function start_lttng_sessiond()
> +{
> + start_lttng_sessiond_opt 1 "$@"
> +}
> +
> +function start_lttng_sessiond_notap()
> {
> + start_lttng_sessiond_opt 0 "$@"
> +}
> +
> +function stop_lttng_sessiond_opt()
> +{
> + local withtap=$1
> +
> if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
> # Env variable requested no session daemon
> return
> @@ -335,8 +375,9 @@ function stop_lttng_sessiond ()
> kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
>
> if [ $? -eq 1 ]; then
> - fail "Kill sessions daemon"
> - return 1
> + if [ $withtap -eq "1" ]; then
> + fail "Kill sessions daemon"
> + fi
> else
> out=1
> while [ -n "$out" ]; do
> @@ -348,10 +389,22 @@ function stop_lttng_sessiond ()
> out=$(pidof $CONSUMERD_BIN)
> sleep 0.5
> done
> - pass "Kill session daemon"
> + if [ $withtap -eq "1" ]; then
> + pass "Kill session daemon"
> + fi
> fi
> }
>
> +function stop_lttng_sessiond()
> +{
> + stop_lttng_sessiond_opt 1 "$@"
> +}
> +
> +function stop_lttng_sessiond_notap()
> +{
> + stop_lttng_sessiond_opt 0 "$@"
> +}
> +
> function list_lttng_with_opts ()
> {
> local opts=$1
> --
> 2.1.4
>
--
J?r?mie Galarneau
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-24 18:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-24 16:23 [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Mathieu Desnoyers
2015-09-24 16:23 ` [lttng-dev] [PATCH lttng-tools v2.6 2/2] Fix: regression tests Mathieu Desnoyers
2015-09-24 18:45 ` Jérémie Galarneau
2015-09-24 18:45 ` [lttng-dev] [PATCH lttng-tools 2.6 1/2] Fix: tests: stderr not correctly redirected Jérémie Galarneau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox