projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Remove unused set +x
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 05d88650e9f369bfd84ed939c405967d2de314b3..a7bf49f181f7ff0262648c106276afa7e78118ec 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-1,5
+1,3
@@
-#!/src/bin/bash
-#
# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
#
# This library is free software; you can redistribute it and/or modify it under
# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
#
# This library is free software; you can redistribute it and/or modify it under
@@
-552,9
+550,9
@@
function stop_lttng_consumerd_opt()
if [ $withtap -eq "1" ]; then
diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')"
fi
if [ $withtap -eq "1" ]; then
diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')"
fi
+
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
- set +x
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
@@
-609,7
+607,6
@@
function sigstop_lttng_consumerd_opt()
fi
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
fi
kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
retval=$?
- set +x
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
if [ $? -eq 1 ]; then
if [ $withtap -eq "1" ]; then
@@
-1403,7
+1400,14
@@
function validate_trace_empty()
skip 0 "Babeltrace binary not found. Skipping trace validation"
fi
skip 0 "Babeltrace binary not found. Skipping trace validation"
fi
- traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | wc -l)
+ events=$($BABELTRACE_BIN $trace_path 2>/dev/null)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ fail "Failed to parse trace"
+ return $ret
+ fi
+
+ traced=$(echo -n "$events" | wc -l)
if [ "$traced" -eq 0 ]; then
pass "Validate empty trace"
else
if [ "$traced" -eq 0 ]; then
pass "Validate empty trace"
else
This page took
0.024258 seconds
and
4
git commands to generate.