projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for create_lttng_session
[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 69feb9494a35b0e39e1f424b509f4d4011e6e0ad..e839b84bfa364590e8fb054cbf3791939b3587bb 100755
(executable)
--- a/
tests/regression/tools/snapshots/ust_test
+++ b/
tests/regression/tools/snapshots/ust_test
@@
-49,7
+49,7
@@
NUM_TESTS=$(($NUM_TESTS + ($NR_SNAPSHOT * 2)))
function start_test_app()
{
function start_test_app()
{
- local tmp_file=
"/tmp/lttng_test_ust.42.file"
+ local tmp_file=
$(mktemp -u)
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
@@
-71,7
+71,7
@@
function stop_test_apps()
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
diag "Stopping $TESTAPP_NAME"
for p in ${APPS_PID}; do
kill ${p}
- wait ${p} 2>
&1
+ wait ${p} 2>
/dev/null
done
APPS_PID=
}
done
APPS_PID=
}
@@
-174,8
+174,6
@@
function test_ust_local_snapshot ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
stop_test_apps
fi
stop_test_apps
@@
-253,8
+251,6
@@
function test_ust_local_snapshot_large_metadata ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
}
fi
}
@@
-288,8
+284,6
@@
function test_ust_per_uid_local_snapshot ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
stop_test_apps
fi
stop_test_apps
@@
-317,8
+311,6
@@
function test_ust_per_uid_local_snapshot_post_mortem ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
}
fi
}
@@
-343,8
+335,6
@@
function test_ust_local_snapshots ()
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
if [ $? -eq 0 ]; then
# Only delete if successful
rm -rf $TRACE_PATH
- else
- break
fi
done
stop_lttng_tracing $SESSION_NAME
fi
done
stop_lttng_tracing $SESSION_NAME
This page took
0.024686 seconds
and
4
git commands to generate.