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: don't use pidof to wait for test apps
[lttng-tools.git]
/
tests
/
regression
/
tools
/
snapshots
/
ust_test
diff --git
a/tests/regression/tools/snapshots/ust_test
b/tests/regression/tools/snapshots/ust_test
index 128849ef8ce7c87618aea7d361803c79ab38307a..0a9e244d814b45c2130bbd2e81172d88269290dd 100755
(executable)
--- a/
tests/regression/tools/snapshots/ust_test
+++ b/
tests/regression/tools/snapshots/ust_test
@@
-63,11
+63,13
@@
function start_test_app()
rm -f $tmp_file
}
rm -f $tmp_file
}
-function
kill
_test_app()
+function
stop
_test_app()
{
diag "Killing $TESTAPP_NAME"
PID_APP=`pidof $TESTAPP_NAME`
kill $PID_APP >/dev/null 2>&1
{
diag "Killing $TESTAPP_NAME"
PID_APP=`pidof $TESTAPP_NAME`
kill $PID_APP >/dev/null 2>&1
+ diag "Waiting on $TESTAPP_NAME"
+ wait
}
function snapshot_add_output ()
}
function snapshot_add_output ()
@@
-170,7
+172,7
@@
function test_ust_local_snapshot ()
rm -rf $TRACE_PATH
fi
rm -rf $TRACE_PATH
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_local_snapshot_max_size ()
}
function test_ust_local_snapshot_max_size ()
@@
-218,7
+220,7
@@
function test_ust_local_snapshot_max_size ()
rm -rf $TRACE_PATH
fi
rm -rf $TRACE_PATH
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_local_snapshot_large_metadata ()
}
function test_ust_local_snapshot_large_metadata ()
@@
-280,7
+282,7
@@
function test_ust_per_uid_local_snapshot ()
rm -rf $TRACE_PATH
fi
rm -rf $TRACE_PATH
fi
-
kill
_test_app
+
stop
_test_app
}
function test_ust_per_uid_local_snapshot_post_mortem ()
}
function test_ust_per_uid_local_snapshot_post_mortem ()
@@
-294,7
+296,7
@@
function test_ust_per_uid_local_snapshot_post_mortem ()
# Returns once the application has at least fired ONE tracepoint.
start_test_app
# Returns once the application has at least fired ONE tracepoint.
start_test_app
-
kill
_test_app
+
stop
_test_app
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
lttng_snapshot_record $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
@@
-334,7
+336,7
@@
function test_ust_local_snapshots ()
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
-
kill
_test_app
+
stop
_test_app
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
This page took
0.026654 seconds
and
4
git commands to generate.