From f5481aa9adff33804a2003baa1157043c35a1ccd Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 27 Aug 2013 17:30:45 -0400 Subject: [PATCH] Tests: change buffers UID test to PID Signed-off-by: David Goulet --- configure.ac | 2 +- tests/fast_regression | 2 +- tests/long_regression | 2 +- tests/regression/ust/Makefile.am | 2 +- .../{buffers-uid => buffers-pid}/Makefile.am | 4 +-- .../test_buffers_pid} | 28 +++++++++---------- 6 files changed, 20 insertions(+), 20 deletions(-) rename tests/regression/ust/{buffers-uid => buffers-pid}/Makefile.am (82%) rename tests/regression/ust/{buffers-uid/test_buffers_uid => buffers-pid/test_buffers_pid} (89%) diff --git a/configure.ac b/configure.ac index 8d42e9019..ba3776230 100644 --- a/configure.ac +++ b/configure.ac @@ -376,7 +376,7 @@ AC_CONFIG_FILES([ tests/regression/ust/high-throughput/Makefile tests/regression/ust/low-throughput/Makefile tests/regression/ust/before-after/Makefile - tests/regression/ust/buffers-uid/Makefile + tests/regression/ust/buffers-pid/Makefile tests/regression/ust/periodical-metadata-flush/Makefile tests/regression/ust/multi-session/Makefile tests/regression/ust/overlap/Makefile diff --git a/tests/fast_regression b/tests/fast_regression index b54d38d0e..92aaff65c 100644 --- a/tests/fast_regression +++ b/tests/fast_regression @@ -7,7 +7,7 @@ regression/tools/tracefile-limits/test_tracefile_size regression/tools/snapshots/test_ust regression/tools/snapshots/test_ust_streaming regression/ust/before-after/test_before_after -regression/ust/buffers-uid/test_buffers_uid +regression/ust/buffers-pid/test_buffers_pid regression/ust/periodical-metadata-flush/test_periodical_metadata_flush regression/ust/multi-session/test_multi_session regression/ust/nprocesses/test_nprocesses diff --git a/tests/long_regression b/tests/long_regression index 246259ab7..b9d6ef8f7 100644 --- a/tests/long_regression +++ b/tests/long_regression @@ -8,7 +8,7 @@ regression/tools/streaming/test_ust regression/tools/tracefile-limits/test_tracefile_count regression/tools/tracefile-limits/test_tracefile_size regression/ust/before-after/test_before_after -regression/ust/buffers-uid/test_buffers_uid +regression/ust/buffers-pid/test_buffers_pid regression/ust/periodical-metadata-flush/test_periodical_metadata_flush regression/ust/high-throughput/test_high_throughput regression/ust/low-throughput/test_low_throughput diff --git a/tests/regression/ust/Makefile.am b/tests/regression/ust/Makefile.am index b3620c008..e7b4cf71b 100644 --- a/tests/regression/ust/Makefile.am +++ b/tests/regression/ust/Makefile.am @@ -1,6 +1,6 @@ if HAVE_LIBLTTNG_UST_CTL SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \ - overlap buffers-uid linking daemon exit-fast fork libc-wrapper \ + overlap buffers-pid linking daemon exit-fast fork libc-wrapper \ periodical-metadata-flush EXTRA_DIST = test_event_basic test_event_wildcard diff --git a/tests/regression/ust/buffers-uid/Makefile.am b/tests/regression/ust/buffers-pid/Makefile.am similarity index 82% rename from tests/regression/ust/buffers-uid/Makefile.am rename to tests/regression/ust/buffers-pid/Makefile.am index 1925768ba..74aacbabb 100644 --- a/tests/regression/ust/buffers-uid/Makefile.am +++ b/tests/regression/ust/buffers-pid/Makefile.am @@ -1,5 +1,5 @@ -noinst_SCRIPTS = test_buffers_uid -EXTRA_DIST = test_buffers_uid +noinst_SCRIPTS = test_buffers_pid +EXTRA_DIST = test_buffers_pid all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ diff --git a/tests/regression/ust/buffers-uid/test_buffers_uid b/tests/regression/ust/buffers-pid/test_buffers_pid similarity index 89% rename from tests/regression/ust/buffers-uid/test_buffers_uid rename to tests/regression/ust/buffers-pid/test_buffers_pid index faeec037c..2d227bf5f 100755 --- a/tests/regression/ust/buffers-uid/test_buffers_uid +++ b/tests/regression/ust/buffers-pid/test_buffers_pid @@ -14,13 +14,13 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -TEST_DESC="UST tracer - Tracing with per UID buffers" +TEST_DESC="UST tracer - Tracing with per PID buffers" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. NR_ITER=100 NR_USEC_WAIT=100000 -SESSION_NAME="buffers-uid" +SESSION_NAME="buffers-pid" TESTAPP_PATH="$TESTDIR/utils/testapp" TESTAPP_NAME="gen-ust-events" @@ -36,13 +36,13 @@ fi # MUST set TESTDIR before calling those functions -function enable_channel_per_uid() +function enable_channel_per_pid() { sess_name=$1 channel_name=$2 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name >/dev/null 2>&1 - ok $? "Enable channel $channel_name per UID for session $sess_name" + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name >/dev/null 2>&1 + ok $? "Enable channel $channel_name per PID for session $sess_name" } function wait_apps @@ -61,7 +61,7 @@ test_after_multiple_apps() { # BEFORE application is spawned create_lttng_session $SESSION_NAME $TRACE_PATH - enable_channel_per_uid $SESSION_NAME "channel0" + enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" start_lttng_tracing $SESSION_NAME @@ -92,7 +92,7 @@ test_before_multiple_apps() { # BEFORE application is spawned create_lttng_session $SESSION_NAME $TRACE_PATH - enable_channel_per_uid $SESSION_NAME "channel0" + enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" start_lttng_tracing $SESSION_NAME @@ -125,7 +125,7 @@ test_after_app() { # BEFORE application is spawned create_lttng_session $SESSION_NAME $TRACE_PATH - enable_channel_per_uid $SESSION_NAME "channel0" + enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" start_lttng_tracing $SESSION_NAME @@ -150,7 +150,7 @@ test_before_app() { # BEFORE application is spawned create_lttng_session $SESSION_NAME $TRACE_PATH - enable_channel_per_uid $SESSION_NAME "channel0" + enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" start_lttng_tracing $SESSION_NAME @@ -183,11 +183,11 @@ test_multiple_channels() { # BEFORE application is spawned create_lttng_session $SESSION_NAME $TRACE_PATH - enable_channel_per_uid $SESSION_NAME "channel0" - enable_channel_per_uid $SESSION_NAME "channel1" - enable_channel_per_uid $SESSION_NAME "channel2" - enable_channel_per_uid $SESSION_NAME "channel3" - enable_channel_per_uid $SESSION_NAME "channel4" + enable_channel_per_pid $SESSION_NAME "channel0" + enable_channel_per_pid $SESSION_NAME "channel1" + enable_channel_per_pid $SESSION_NAME "channel2" + enable_channel_per_pid $SESSION_NAME "channel3" + enable_channel_per_pid $SESSION_NAME "channel4" # Enable event in all channels. $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel0 -s $SESSION_NAME -u >/dev/null 2>&1 ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel0" -- 2.34.1