From 9ac429ef32142eaecfec2d1a44569464c4f8f721 Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Thu, 21 Feb 2013 14:20:25 -0500 Subject: [PATCH] Tests: Move tests to tests/regression Also move the utils.sh and utils.h helper files under tests/utils. Signed-off-by: Christian Babeux --- configure.ac | 27 ++++++++++--------- tests/Makefile.am | 14 +--------- tests/regression/Makefile.am | 13 +++++++++ tests/{ => regression}/kernel/Makefile.am | 4 +-- .../kernel/kernel_all_events_basic.c | 0 .../kernel/kernel_event_basic.c | 0 .../kernel/run-kernel-tests.sh | 4 +-- tests/{ => regression}/kernel/runall.sh | 0 tests/{ => regression}/run-report.py | 0 tests/{ => regression}/runall.sh | 4 +-- tests/{ => regression}/test_list.py | 0 tests/{ => regression}/tools/Makefile.am | 4 +-- .../tools/filtering/Makefile.am | 0 .../tools/filtering/babelstats.pl | 0 .../tools/filtering/gen-ust-events.c | 0 .../tools/filtering/invalid-filters | 4 +-- tests/{ => regression}/tools/filtering/runall | 0 tests/{ => regression}/tools/filtering/tp.c | 0 tests/{ => regression}/tools/filtering/tp.h | 0 .../tools/filtering/unsupported-ops | 4 +-- .../tools/filtering/valid-filters | 4 +-- .../{ => regression}/tools/health/Makefile.am | 2 +- .../tools/health/health_check.c | 0 .../tools/health/health_exit.c | 0 .../tools/health/health_fail.c | 0 .../tools/health/health_stall.c | 0 .../tools/health/health_thread_exit | 4 +-- .../tools/health/health_thread_stall | 4 +-- .../tools/health/health_tp_fail | 4 +-- tests/{ => regression}/tools/health/runall | 0 tests/{ => regression}/tools/runall.sh | 0 .../tools/streaming/Makefile.am | 2 +- .../tools/streaming/gen-ust-events.c | 0 .../tools/streaming/high_throughput_limits | 4 +-- .../tools/streaming/run-kernel | 4 +-- .../{ => regression}/tools/streaming/run-ust | 4 +-- tests/{ => regression}/tools/streaming/runall | 0 tests/{ => regression}/tools/streaming/tp.c | 0 tests/{ => regression}/tools/streaming/tp.h | 0 .../tools/streaming/unit_tests.c | 0 .../tools/streaming/uri_switch | 4 +-- .../tools/test_kernel_data_trace.c | 0 tests/{ => regression}/tools/test_sessions.c | 0 .../tools/test_ust_data_trace.c | 0 tests/{ => regression}/ust/Makefile.am | 4 +-- .../ust/before-after/Makefile.am | 0 .../ust/before-after/gen-nevents.c | 0 tests/{ => regression}/ust/before-after/run | 4 +-- tests/{ => regression}/ust/before-after/tp.c | 0 .../ust/before-after/ust_gen_nevents.h | 2 +- .../ust/high-throughput/Makefile.am | 0 .../ust/high-throughput/main.c | 0 .../{ => regression}/ust/high-throughput/run | 4 +-- .../{ => regression}/ust/high-throughput/tp.c | 0 .../{ => regression}/ust/high-throughput/tp.h | 2 +- .../ust/low-throughput/Makefile.am | 0 .../ust/low-throughput/main.c | 0 tests/{ => regression}/ust/low-throughput/run | 4 +-- .../{ => regression}/ust/low-throughput/tp.c | 0 .../{ => regression}/ust/low-throughput/tp.h | 2 +- .../ust/multi-session/Makefile.am | 0 .../ust/multi-session/gen-nevents.c | 0 tests/{ => regression}/ust/multi-session/run | 4 +-- tests/{ => regression}/ust/multi-session/tp.c | 0 .../ust/multi-session/ust_gen_nevents.h | 2 +- .../ust/nprocesses/Makefile.am | 0 .../ust/nprocesses/gen-events-time.c | 0 tests/{ => regression}/ust/nprocesses/run | 4 +-- tests/{ => regression}/ust/nprocesses/tp.c | 0 .../ust/nprocesses/ust-nprocesses | 4 +-- .../ust/nprocesses/ust_gen_event.h | 0 .../{ => regression}/ust/overlap/Makefile.am | 0 .../ust/overlap/demo/Makefile.am | 0 .../ust/overlap/demo/demo-trace | 0 .../{ => regression}/ust/overlap/demo/demo.c | 0 tests/{ => regression}/ust/overlap/demo/tp.c | 0 tests/{ => regression}/ust/overlap/demo/tp2.c | 0 tests/{ => regression}/ust/overlap/demo/tp3.c | 0 .../ust/overlap/demo/ust_tests_demo.h | 0 .../ust/overlap/demo/ust_tests_demo2.h | 0 .../ust/overlap/demo/ust_tests_demo3.h | 0 tests/{ => regression}/ust/overlap/overlap.sh | 4 +-- tests/{ => regression}/ust/overlap/run | 0 .../ust/run-ust-global-tests.sh | 4 +-- tests/{ => regression}/ust/runall.sh | 0 .../ust/ust_global_event_basic.c | 2 +- .../ust/ust_global_event_wildcard.c | 0 tests/{ => utils}/utils.h | 0 tests/{ => utils}/utils.sh | 4 +-- 89 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 tests/regression/Makefile.am rename tests/{ => regression}/kernel/Makefile.am (91%) rename tests/{ => regression}/kernel/kernel_all_events_basic.c (100%) rename tests/{ => regression}/kernel/kernel_event_basic.c (100%) rename tests/{ => regression}/kernel/run-kernel-tests.sh (94%) rename tests/{ => regression}/kernel/runall.sh (100%) rename tests/{ => regression}/run-report.py (100%) rename tests/{ => regression}/runall.sh (95%) rename tests/{ => regression}/test_list.py (100%) rename tests/{ => regression}/tools/Makefile.am (95%) rename tests/{ => regression}/tools/filtering/Makefile.am (100%) rename tests/{ => regression}/tools/filtering/babelstats.pl (100%) rename tests/{ => regression}/tools/filtering/gen-ust-events.c (100%) rename tests/{ => regression}/tools/filtering/invalid-filters (98%) rename tests/{ => regression}/tools/filtering/runall (100%) rename tests/{ => regression}/tools/filtering/tp.c (100%) rename tests/{ => regression}/tools/filtering/tp.h (100%) rename tests/{ => regression}/tools/filtering/unsupported-ops (97%) rename tests/{ => regression}/tools/filtering/valid-filters (99%) rename tests/{ => regression}/tools/health/Makefile.am (96%) rename tests/{ => regression}/tools/health/health_check.c (100%) rename tests/{ => regression}/tools/health/health_exit.c (100%) rename tests/{ => regression}/tools/health/health_fail.c (100%) rename tests/{ => regression}/tools/health/health_stall.c (100%) rename tests/{ => regression}/tools/health/health_thread_exit (97%) rename tests/{ => regression}/tools/health/health_thread_stall (98%) rename tests/{ => regression}/tools/health/health_tp_fail (97%) rename tests/{ => regression}/tools/health/runall (100%) rename tests/{ => regression}/tools/runall.sh (100%) rename tests/{ => regression}/tools/streaming/Makefile.am (94%) rename tests/{ => regression}/tools/streaming/gen-ust-events.c (100%) rename tests/{ => regression}/tools/streaming/high_throughput_limits (99%) rename tests/{ => regression}/tools/streaming/run-kernel (98%) rename tests/{ => regression}/tools/streaming/run-ust (97%) rename tests/{ => regression}/tools/streaming/runall (100%) rename tests/{ => regression}/tools/streaming/tp.c (100%) rename tests/{ => regression}/tools/streaming/tp.h (100%) rename tests/{ => regression}/tools/streaming/unit_tests.c (100%) rename tests/{ => regression}/tools/streaming/uri_switch (98%) rename tests/{ => regression}/tools/test_kernel_data_trace.c (100%) rename tests/{ => regression}/tools/test_sessions.c (100%) rename tests/{ => regression}/tools/test_ust_data_trace.c (100%) rename tests/{ => regression}/ust/Makefile.am (86%) rename tests/{ => regression}/ust/before-after/Makefile.am (100%) rename tests/{ => regression}/ust/before-after/gen-nevents.c (100%) rename tests/{ => regression}/ust/before-after/run (97%) rename tests/{ => regression}/ust/before-after/tp.c (100%) rename tests/{ => regression}/ust/before-after/ust_gen_nevents.h (98%) rename tests/{ => regression}/ust/high-throughput/Makefile.am (100%) rename tests/{ => regression}/ust/high-throughput/main.c (100%) rename tests/{ => regression}/ust/high-throughput/run (97%) rename tests/{ => regression}/ust/high-throughput/tp.c (100%) rename tests/{ => regression}/ust/high-throughput/tp.h (98%) rename tests/{ => regression}/ust/low-throughput/Makefile.am (100%) rename tests/{ => regression}/ust/low-throughput/main.c (100%) rename tests/{ => regression}/ust/low-throughput/run (97%) rename tests/{ => regression}/ust/low-throughput/tp.c (100%) rename tests/{ => regression}/ust/low-throughput/tp.h (98%) rename tests/{ => regression}/ust/multi-session/Makefile.am (100%) rename tests/{ => regression}/ust/multi-session/gen-nevents.c (100%) rename tests/{ => regression}/ust/multi-session/run (97%) rename tests/{ => regression}/ust/multi-session/tp.c (100%) rename tests/{ => regression}/ust/multi-session/ust_gen_nevents.h (98%) rename tests/{ => regression}/ust/nprocesses/Makefile.am (100%) rename tests/{ => regression}/ust/nprocesses/gen-events-time.c (100%) rename tests/{ => regression}/ust/nprocesses/run (95%) rename tests/{ => regression}/ust/nprocesses/tp.c (100%) rename tests/{ => regression}/ust/nprocesses/ust-nprocesses (97%) rename tests/{ => regression}/ust/nprocesses/ust_gen_event.h (100%) rename tests/{ => regression}/ust/overlap/Makefile.am (100%) rename tests/{ => regression}/ust/overlap/demo/Makefile.am (100%) rename tests/{ => regression}/ust/overlap/demo/demo-trace (100%) rename tests/{ => regression}/ust/overlap/demo/demo.c (100%) rename tests/{ => regression}/ust/overlap/demo/tp.c (100%) rename tests/{ => regression}/ust/overlap/demo/tp2.c (100%) rename tests/{ => regression}/ust/overlap/demo/tp3.c (100%) rename tests/{ => regression}/ust/overlap/demo/ust_tests_demo.h (100%) rename tests/{ => regression}/ust/overlap/demo/ust_tests_demo2.h (100%) rename tests/{ => regression}/ust/overlap/demo/ust_tests_demo3.h (100%) rename tests/{ => regression}/ust/overlap/overlap.sh (99%) rename tests/{ => regression}/ust/overlap/run (100%) rename tests/{ => regression}/ust/run-ust-global-tests.sh (92%) rename tests/{ => regression}/ust/runall.sh (100%) rename tests/{ => regression}/ust/ust_global_event_basic.c (99%) rename tests/{ => regression}/ust/ust_global_event_wildcard.c (100%) rename tests/{ => utils}/utils.h (100%) rename tests/{ => utils}/utils.sh (99%) diff --git a/configure.ac b/configure.ac index 71fbb6034..5cb2e90b4 100644 --- a/configure.ac +++ b/configure.ac @@ -309,19 +309,20 @@ AC_CONFIG_FILES([ src/bin/lttng-relayd/Makefile src/bin/lttng/Makefile tests/Makefile - tests/kernel/Makefile - tests/tools/Makefile - tests/tools/streaming/Makefile - tests/tools/filtering/Makefile - tests/tools/health/Makefile - tests/ust/Makefile - tests/ust/nprocesses/Makefile - tests/ust/high-throughput/Makefile - tests/ust/low-throughput/Makefile - tests/ust/before-after/Makefile - tests/ust/multi-session/Makefile - tests/ust/overlap/Makefile - tests/ust/overlap/demo/Makefile + tests/regression/Makefile + tests/regression/kernel/Makefile + tests/regression/tools/Makefile + tests/regression/tools/streaming/Makefile + tests/regression/tools/filtering/Makefile + tests/regression/tools/health/Makefile + tests/regression/ust/Makefile + tests/regression/ust/nprocesses/Makefile + tests/regression/ust/high-throughput/Makefile + tests/regression/ust/low-throughput/Makefile + tests/regression/ust/before-after/Makefile + tests/regression/ust/multi-session/Makefile + tests/regression/ust/overlap/Makefile + tests/regression/ust/overlap/demo/Makefile ]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am index bc0f0a59a..2a4309e01 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,13 +1 @@ -SUBDIRS = . tools kernel - -AM_CFLAGS = -g -Wall -AM_LDFLAGS = -lurcu -lurcu-cds - -EXTRA_DIST = run-report.py test_list.py utils.sh utils.h runall.sh - -if HAVE_LIBLTTNG_UST_CTL -SUBDIRS += ust -endif # HAVE_LIBLTTNG_UST_CTL - -check-am: - ./runall.sh +SUBDIRS = . regression diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am new file mode 100644 index 000000000..441354e12 --- /dev/null +++ b/tests/regression/Makefile.am @@ -0,0 +1,13 @@ +SUBDIRS = . tools kernel + +AM_CFLAGS = -g -Wall +AM_LDFLAGS = -lurcu -lurcu-cds + +EXTRA_DIST = run-report.py test_list.py runall.sh + +if HAVE_LIBLTTNG_UST_CTL +SUBDIRS += ust +endif # HAVE_LIBLTTNG_UST_CTL + +check-am: + ./runall.sh diff --git a/tests/kernel/Makefile.am b/tests/regression/kernel/Makefile.am similarity index 91% rename from tests/kernel/Makefile.am rename to tests/regression/kernel/Makefile.am index 8872af425..5cfe81e3f 100644 --- a/tests/kernel/Makefile.am +++ b/tests/regression/kernel/Makefile.am @@ -1,11 +1,11 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall +AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -g -Wall AM_LDFLAGS = -lurcu -lurcu-cds EXTRA_DIST = runall.sh run-kernel-tests.sh noinst_PROGRAMS = kernel_all_events_basic kernel_event_basic -UTILS=../utils.h +UTILS=$(top_srcdir)/tests/utils/utils.h LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \ diff --git a/tests/kernel/kernel_all_events_basic.c b/tests/regression/kernel/kernel_all_events_basic.c similarity index 100% rename from tests/kernel/kernel_all_events_basic.c rename to tests/regression/kernel/kernel_all_events_basic.c diff --git a/tests/kernel/kernel_event_basic.c b/tests/regression/kernel/kernel_event_basic.c similarity index 100% rename from tests/kernel/kernel_event_basic.c rename to tests/regression/kernel/kernel_event_basic.c diff --git a/tests/kernel/run-kernel-tests.sh b/tests/regression/kernel/run-kernel-tests.sh similarity index 94% rename from tests/kernel/run-kernel-tests.sh rename to tests/regression/kernel/run-kernel-tests.sh index 6948e1fa2..ec2ceaf91 100755 --- a/tests/kernel/run-kernel-tests.sh +++ b/tests/regression/kernel/run-kernel-tests.sh @@ -2,9 +2,9 @@ SESSIOND_BIN="lttng-sessiond" CURDIR=$(dirname $0) -TESTDIR=$CURDIR/.. +TESTDIR=$CURDIR/../.. -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh tmpdir=`mktemp -d` tests=( $CURDIR/kernel_event_basic $CURDIR/kernel_all_events_basic ) diff --git a/tests/kernel/runall.sh b/tests/regression/kernel/runall.sh similarity index 100% rename from tests/kernel/runall.sh rename to tests/regression/kernel/runall.sh diff --git a/tests/run-report.py b/tests/regression/run-report.py similarity index 100% rename from tests/run-report.py rename to tests/regression/run-report.py diff --git a/tests/runall.sh b/tests/regression/runall.sh similarity index 95% rename from tests/runall.sh rename to tests/regression/runall.sh index 0adbb2e4b..4db6d5adb 100755 --- a/tests/runall.sh +++ b/tests/regression/runall.sh @@ -23,9 +23,9 @@ tests=( kernel/runall.sh ust/runall.sh tools/runall.sh ) #### END TESTS HERE #### -TESTDIR=$(dirname $0) +TESTDIR=$(dirname $0)/.. -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh ## lttng-tools unit tests ## # No session daemon needed diff --git a/tests/test_list.py b/tests/regression/test_list.py similarity index 100% rename from tests/test_list.py rename to tests/regression/test_list.py diff --git a/tests/tools/Makefile.am b/tests/regression/tools/Makefile.am similarity index 95% rename from tests/tools/Makefile.am rename to tests/regression/tools/Makefile.am index 4fe494cec..40f3cc0c1 100644 --- a/tests/tools/Makefile.am +++ b/tests/regression/tools/Makefile.am @@ -1,13 +1,13 @@ SUBDIRS = streaming filtering health -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -g -Wall +AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -g -Wall AM_LDFLAGS = -lurcu EXTRA_DIST = runall.sh noinst_PROGRAMS = test_sessions test_kernel_data_trace -UTILS=../utils.h +UTILS=$(top_srcdir)/tests/utils/utils.h SESSIONS=$(top_srcdir)/src/bin/lttng-sessiond/session.c \ $(top_srcdir)/src/bin/lttng-sessiond/consumer.c \ $(top_srcdir)/src/common/uri.c \ diff --git a/tests/tools/filtering/Makefile.am b/tests/regression/tools/filtering/Makefile.am similarity index 100% rename from tests/tools/filtering/Makefile.am rename to tests/regression/tools/filtering/Makefile.am diff --git a/tests/tools/filtering/babelstats.pl b/tests/regression/tools/filtering/babelstats.pl similarity index 100% rename from tests/tools/filtering/babelstats.pl rename to tests/regression/tools/filtering/babelstats.pl diff --git a/tests/tools/filtering/gen-ust-events.c b/tests/regression/tools/filtering/gen-ust-events.c similarity index 100% rename from tests/tools/filtering/gen-ust-events.c rename to tests/regression/tools/filtering/gen-ust-events.c diff --git a/tests/tools/filtering/invalid-filters b/tests/regression/tools/filtering/invalid-filters similarity index 98% rename from tests/tools/filtering/invalid-filters rename to tests/regression/tools/filtering/invalid-filters index b6537055c..48db698dd 100755 --- a/tests/tools/filtering/invalid-filters +++ b/tests/regression/tools/filtering/invalid-filters @@ -18,14 +18,14 @@ TEST_DESC="Filtering - Invalid filters" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" SESSION_NAME="filter-invalid" EVENT_NAME="bogus" ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr" TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/filtering/runall b/tests/regression/tools/filtering/runall similarity index 100% rename from tests/tools/filtering/runall rename to tests/regression/tools/filtering/runall diff --git a/tests/tools/filtering/tp.c b/tests/regression/tools/filtering/tp.c similarity index 100% rename from tests/tools/filtering/tp.c rename to tests/regression/tools/filtering/tp.c diff --git a/tests/tools/filtering/tp.h b/tests/regression/tools/filtering/tp.h similarity index 100% rename from tests/tools/filtering/tp.h rename to tests/regression/tools/filtering/tp.h diff --git a/tests/tools/filtering/unsupported-ops b/tests/regression/tools/filtering/unsupported-ops similarity index 97% rename from tests/tools/filtering/unsupported-ops rename to tests/regression/tools/filtering/unsupported-ops index 8b743f41c..9fac9dec8 100755 --- a/tests/tools/filtering/unsupported-ops +++ b/tests/regression/tools/filtering/unsupported-ops @@ -18,14 +18,14 @@ TEST_DESC="Filtering - Unsupported operators" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" SESSION_NAME="filter-unsupported-ops" EVENT_NAME="bogus" ENABLE_EVENT_STDERR="/tmp/unsupported-ops-enable" TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/filtering/valid-filters b/tests/regression/tools/filtering/valid-filters similarity index 99% rename from tests/tools/filtering/valid-filters rename to tests/regression/tools/filtering/valid-filters index 3d7e921f2..067d205e7 100755 --- a/tests/tools/filtering/valid-filters +++ b/tests/regression/tools/filtering/valid-filters @@ -18,7 +18,7 @@ TEST_DESC="Filtering - Valid filters" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" BIN_NAME="gen-ust-events" STATS_BIN="babelstats.pl" @@ -26,7 +26,7 @@ SESSION_NAME="valid_filter" EVENT_NAME="tp:tptest" NR_ITER=100 -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/health/Makefile.am b/tests/regression/tools/health/Makefile.am similarity index 96% rename from tests/tools/health/Makefile.am rename to tests/regression/tools/health/Makefile.am index 26d246161..1a0a8f6d1 100644 --- a/tests/tools/health/Makefile.am +++ b/tests/regression/tools/health/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I. -O2 -g -I../../../include +AM_CFLAGS = -I. -O2 -g -I$(top_srcdir)/include AM_LDFLAGS = if LTTNG_TOOLS_BUILD_WITH_LIBDL diff --git a/tests/tools/health/health_check.c b/tests/regression/tools/health/health_check.c similarity index 100% rename from tests/tools/health/health_check.c rename to tests/regression/tools/health/health_check.c diff --git a/tests/tools/health/health_exit.c b/tests/regression/tools/health/health_exit.c similarity index 100% rename from tests/tools/health/health_exit.c rename to tests/regression/tools/health/health_exit.c diff --git a/tests/tools/health/health_fail.c b/tests/regression/tools/health/health_fail.c similarity index 100% rename from tests/tools/health/health_fail.c rename to tests/regression/tools/health/health_fail.c diff --git a/tests/tools/health/health_stall.c b/tests/regression/tools/health/health_stall.c similarity index 100% rename from tests/tools/health/health_stall.c rename to tests/regression/tools/health/health_stall.c diff --git a/tests/tools/health/health_thread_exit b/tests/regression/tools/health/health_thread_exit similarity index 97% rename from tests/tools/health/health_thread_exit rename to tests/regression/tools/health/health_thread_exit index de783ad08..79e0e051d 100755 --- a/tests/tools/health/health_thread_exit +++ b/tests/regression/tools/health/health_thread_exit @@ -18,14 +18,14 @@ TEST_DESC="Health check - Thread exit" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" SESSION_NAME="health_thread_exit" EVENT_NAME="bogus" HEALTH_CHECK_BIN="health_check" SESSIOND_PRELOAD=".libs/libhealthexit.so" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/health/health_thread_stall b/tests/regression/tools/health/health_thread_stall similarity index 98% rename from tests/tools/health/health_thread_stall rename to tests/regression/tools/health/health_thread_stall index 5fd39ed6f..dc9d850f4 100755 --- a/tests/tools/health/health_thread_stall +++ b/tests/regression/tools/health/health_thread_stall @@ -18,14 +18,14 @@ TEST_DESC="Health check - Thread stall" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" SESSION_NAME="health_thread_stall" EVENT_NAME="bogus" HEALTH_CHECK_BIN="health_check" SESSIOND_PRELOAD=".libs/libhealthstall.so" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/health/health_tp_fail b/tests/regression/tools/health/health_tp_fail similarity index 97% rename from tests/tools/health/health_tp_fail rename to tests/regression/tools/health/health_tp_fail index 5b68e62be..0b474fa78 100755 --- a/tests/tools/health/health_tp_fail +++ b/tests/regression/tools/health/health_tp_fail @@ -18,14 +18,14 @@ TEST_DESC="Health check - Testpoint failure" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. LTTNG_BIN="lttng" SESSION_NAME="health_tp_fail" EVENT_NAME="bogus" HEALTH_CHECK_BIN="health_check" SESSIOND_PRELOAD=".libs/libhealthtpfail.so" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/health/runall b/tests/regression/tools/health/runall similarity index 100% rename from tests/tools/health/runall rename to tests/regression/tools/health/runall diff --git a/tests/tools/runall.sh b/tests/regression/tools/runall.sh similarity index 100% rename from tests/tools/runall.sh rename to tests/regression/tools/runall.sh diff --git a/tests/tools/streaming/Makefile.am b/tests/regression/tools/streaming/Makefile.am similarity index 94% rename from tests/tools/streaming/Makefile.am rename to tests/regression/tools/streaming/Makefile.am index 3ff8ef0a1..3fab87e9b 100644 --- a/tests/tools/streaming/Makefile.am +++ b/tests/regression/tools/streaming/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests -I$(srcdir) -O2 -g +AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(srcdir) -O2 -g AM_LDFLAGS = if LTTNG_TOOLS_BUILD_WITH_LIBDL diff --git a/tests/tools/streaming/gen-ust-events.c b/tests/regression/tools/streaming/gen-ust-events.c similarity index 100% rename from tests/tools/streaming/gen-ust-events.c rename to tests/regression/tools/streaming/gen-ust-events.c diff --git a/tests/tools/streaming/high_throughput_limits b/tests/regression/tools/streaming/high_throughput_limits similarity index 99% rename from tests/tools/streaming/high_throughput_limits rename to tests/regression/tools/streaming/high_throughput_limits index ebe5020a6..e2f094d22 100755 --- a/tests/tools/streaming/high_throughput_limits +++ b/tests/regression/tools/streaming/high_throughput_limits @@ -19,7 +19,7 @@ TEST_DESC="Streaming - High throughput with bandwidth limits" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. NR_APP_ITER=10 NR_ITER=1000000 BIN_NAME="gen-ust-events" @@ -31,7 +31,7 @@ DEFAULT_IF="lo" TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/streaming/run-kernel b/tests/regression/tools/streaming/run-kernel similarity index 98% rename from tests/tools/streaming/run-kernel rename to tests/regression/tools/streaming/run-kernel index 545cae7c8..f8b813d28 100755 --- a/tests/tools/streaming/run-kernel +++ b/tests/regression/tools/streaming/run-kernel @@ -17,14 +17,14 @@ TEST_DESC="Streaming - Kernel tracing" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. EVENT_NAME="sched_switch" PID_RELAYD=0 SESSION_NAME="" TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/streaming/run-ust b/tests/regression/tools/streaming/run-ust similarity index 97% rename from tests/tools/streaming/run-ust rename to tests/regression/tools/streaming/run-ust index 28b72f824..6e6e5a752 100755 --- a/tests/tools/streaming/run-ust +++ b/tests/regression/tools/streaming/run-ust @@ -17,7 +17,7 @@ TEST_DESC="Streaming - User space tracing" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. BIN_NAME="gen-ust-events" SESSION_NAME="stream" EVENT_NAME="tp:tptest" @@ -25,7 +25,7 @@ PID_RELAYD=0 TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/streaming/runall b/tests/regression/tools/streaming/runall similarity index 100% rename from tests/tools/streaming/runall rename to tests/regression/tools/streaming/runall diff --git a/tests/tools/streaming/tp.c b/tests/regression/tools/streaming/tp.c similarity index 100% rename from tests/tools/streaming/tp.c rename to tests/regression/tools/streaming/tp.c diff --git a/tests/tools/streaming/tp.h b/tests/regression/tools/streaming/tp.h similarity index 100% rename from tests/tools/streaming/tp.h rename to tests/regression/tools/streaming/tp.h diff --git a/tests/tools/streaming/unit_tests.c b/tests/regression/tools/streaming/unit_tests.c similarity index 100% rename from tests/tools/streaming/unit_tests.c rename to tests/regression/tools/streaming/unit_tests.c diff --git a/tests/tools/streaming/uri_switch b/tests/regression/tools/streaming/uri_switch similarity index 98% rename from tests/tools/streaming/uri_switch rename to tests/regression/tools/streaming/uri_switch index 4eb435983..06a3fbcd4 100755 --- a/tests/tools/streaming/uri_switch +++ b/tests/regression/tools/streaming/uri_switch @@ -18,7 +18,7 @@ TEST_DESC="Streaming - URI switching" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. BIN_NAME="gen-ust-events" SESSION_NAME="stream" EVENT_NAME="tp:tptest" @@ -26,7 +26,7 @@ PID_RELAYD=0 TRACE_PATH=$(mktemp -d) -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/tools/test_kernel_data_trace.c b/tests/regression/tools/test_kernel_data_trace.c similarity index 100% rename from tests/tools/test_kernel_data_trace.c rename to tests/regression/tools/test_kernel_data_trace.c diff --git a/tests/tools/test_sessions.c b/tests/regression/tools/test_sessions.c similarity index 100% rename from tests/tools/test_sessions.c rename to tests/regression/tools/test_sessions.c diff --git a/tests/tools/test_ust_data_trace.c b/tests/regression/tools/test_ust_data_trace.c similarity index 100% rename from tests/tools/test_ust_data_trace.c rename to tests/regression/tools/test_ust_data_trace.c diff --git a/tests/ust/Makefile.am b/tests/regression/ust/Makefile.am similarity index 86% rename from tests/ust/Makefile.am rename to tests/regression/ust/Makefile.am index c59829051..9bca8809a 100644 --- a/tests/ust/Makefile.am +++ b/tests/regression/ust/Makefile.am @@ -2,14 +2,14 @@ if HAVE_LIBLTTNG_UST_CTL SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \ overlap -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests -I$(top_srcdir)/src -g -Wall +AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src -g -Wall AM_LDFLAGS = -lurcu -lurcu-cds EXTRA_DIST = runall.sh run-ust-global-tests.sh noinst_PROGRAMS = ust_global_event_basic ust_global_event_wildcard -UTILS=../utils.h +UTILS=$(top_srcdir)/tests/utils/utils.h LIBLTTNG=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la SESSIONDSRC=$(top_srcdir)/src/common/sessiond-comm/sessiond-comm.c \ diff --git a/tests/ust/before-after/Makefile.am b/tests/regression/ust/before-after/Makefile.am similarity index 100% rename from tests/ust/before-after/Makefile.am rename to tests/regression/ust/before-after/Makefile.am diff --git a/tests/ust/before-after/gen-nevents.c b/tests/regression/ust/before-after/gen-nevents.c similarity index 100% rename from tests/ust/before-after/gen-nevents.c rename to tests/regression/ust/before-after/gen-nevents.c diff --git a/tests/ust/before-after/run b/tests/regression/ust/before-after/run similarity index 97% rename from tests/ust/before-after/run rename to tests/regression/ust/before-after/run index 46b97f443..cb1f8c2cd 100755 --- a/tests/ust/before-after/run +++ b/tests/regression/ust/before-after/run @@ -17,12 +17,12 @@ TEST_DESC="UST tracer - Start tracing before and after execution" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. NR_ITER=100 SESSION_NAME="per-session" EVENT_NAME="ust_gen_nevents:tptest" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/before-after/tp.c b/tests/regression/ust/before-after/tp.c similarity index 100% rename from tests/ust/before-after/tp.c rename to tests/regression/ust/before-after/tp.c diff --git a/tests/ust/before-after/ust_gen_nevents.h b/tests/regression/ust/before-after/ust_gen_nevents.h similarity index 98% rename from tests/ust/before-after/ust_gen_nevents.h rename to tests/regression/ust/before-after/ust_gen_nevents.h index 8d82ecb4e..bc09c4497 100644 --- a/tests/ust/before-after/ust_gen_nevents.h +++ b/tests/regression/ust/before-after/ust_gen_nevents.h @@ -51,6 +51,6 @@ TRACEPOINT_EVENT(ust_gen_nevents, tptest, /* This part must be outside ifdef protection */ #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/tests/ust/high-throughput/Makefile.am b/tests/regression/ust/high-throughput/Makefile.am similarity index 100% rename from tests/ust/high-throughput/Makefile.am rename to tests/regression/ust/high-throughput/Makefile.am diff --git a/tests/ust/high-throughput/main.c b/tests/regression/ust/high-throughput/main.c similarity index 100% rename from tests/ust/high-throughput/main.c rename to tests/regression/ust/high-throughput/main.c diff --git a/tests/ust/high-throughput/run b/tests/regression/ust/high-throughput/run similarity index 97% rename from tests/ust/high-throughput/run rename to tests/regression/ust/high-throughput/run index dff5fdd49..550607328 100755 --- a/tests/ust/high-throughput/run +++ b/tests/regression/ust/high-throughput/run @@ -17,13 +17,13 @@ TEST_DESC="UST tracer - Testing high events throughput" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. NR_ITER=20 BIN_NAME="gen-events" SESSION_NAME="high-throughput" EVENT_NAME="tp:tptest" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/high-throughput/tp.c b/tests/regression/ust/high-throughput/tp.c similarity index 100% rename from tests/ust/high-throughput/tp.c rename to tests/regression/ust/high-throughput/tp.c diff --git a/tests/ust/high-throughput/tp.h b/tests/regression/ust/high-throughput/tp.h similarity index 98% rename from tests/ust/high-throughput/tp.h rename to tests/regression/ust/high-throughput/tp.h index 23d4d2508..12286b4db 100644 --- a/tests/ust/high-throughput/tp.h +++ b/tests/regression/ust/high-throughput/tp.h @@ -56,6 +56,6 @@ TRACEPOINT_EVENT(tp, tptest_sighandler, /* This part must be outside ifdef protection */ #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/tests/ust/low-throughput/Makefile.am b/tests/regression/ust/low-throughput/Makefile.am similarity index 100% rename from tests/ust/low-throughput/Makefile.am rename to tests/regression/ust/low-throughput/Makefile.am diff --git a/tests/ust/low-throughput/main.c b/tests/regression/ust/low-throughput/main.c similarity index 100% rename from tests/ust/low-throughput/main.c rename to tests/regression/ust/low-throughput/main.c diff --git a/tests/ust/low-throughput/run b/tests/regression/ust/low-throughput/run similarity index 97% rename from tests/ust/low-throughput/run rename to tests/regression/ust/low-throughput/run index 26e074997..2e111336e 100755 --- a/tests/ust/low-throughput/run +++ b/tests/regression/ust/low-throughput/run @@ -17,12 +17,12 @@ TEST_DESC="UST tracer - Testing low events throughput" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. BIN_NAME="gen-events" SESSION_NAME="low-throughput" EVENT_NAME="tp:slow" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/low-throughput/tp.c b/tests/regression/ust/low-throughput/tp.c similarity index 100% rename from tests/ust/low-throughput/tp.c rename to tests/regression/ust/low-throughput/tp.c diff --git a/tests/ust/low-throughput/tp.h b/tests/regression/ust/low-throughput/tp.h similarity index 98% rename from tests/ust/low-throughput/tp.h rename to tests/regression/ust/low-throughput/tp.h index 74b908b56..b45a3dd87 100644 --- a/tests/ust/low-throughput/tp.h +++ b/tests/regression/ust/low-throughput/tp.h @@ -40,6 +40,6 @@ TRACEPOINT_EVENT(tp, slow, /* This part must be outside ifdef protection */ #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/tests/ust/multi-session/Makefile.am b/tests/regression/ust/multi-session/Makefile.am similarity index 100% rename from tests/ust/multi-session/Makefile.am rename to tests/regression/ust/multi-session/Makefile.am diff --git a/tests/ust/multi-session/gen-nevents.c b/tests/regression/ust/multi-session/gen-nevents.c similarity index 100% rename from tests/ust/multi-session/gen-nevents.c rename to tests/regression/ust/multi-session/gen-nevents.c diff --git a/tests/ust/multi-session/run b/tests/regression/ust/multi-session/run similarity index 97% rename from tests/ust/multi-session/run rename to tests/regression/ust/multi-session/run index 7242fd90e..18e220dcf 100755 --- a/tests/ust/multi-session/run +++ b/tests/regression/ust/multi-session/run @@ -17,12 +17,12 @@ TEST_DESC="UST tracer - Multi-session" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. NR_ITER=100 SESSION_NAME="multi-session" EVENT_NAME="ust_gen_nevents:tptest" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/multi-session/tp.c b/tests/regression/ust/multi-session/tp.c similarity index 100% rename from tests/ust/multi-session/tp.c rename to tests/regression/ust/multi-session/tp.c diff --git a/tests/ust/multi-session/ust_gen_nevents.h b/tests/regression/ust/multi-session/ust_gen_nevents.h similarity index 98% rename from tests/ust/multi-session/ust_gen_nevents.h rename to tests/regression/ust/multi-session/ust_gen_nevents.h index cba3994c6..58e4c17e3 100644 --- a/tests/ust/multi-session/ust_gen_nevents.h +++ b/tests/regression/ust/multi-session/ust_gen_nevents.h @@ -63,6 +63,6 @@ TRACEPOINT_EVENT(ust_gen_nevents, tptest3, /* This part must be outside ifdef protection */ #include -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/tests/ust/nprocesses/Makefile.am b/tests/regression/ust/nprocesses/Makefile.am similarity index 100% rename from tests/ust/nprocesses/Makefile.am rename to tests/regression/ust/nprocesses/Makefile.am diff --git a/tests/ust/nprocesses/gen-events-time.c b/tests/regression/ust/nprocesses/gen-events-time.c similarity index 100% rename from tests/ust/nprocesses/gen-events-time.c rename to tests/regression/ust/nprocesses/gen-events-time.c diff --git a/tests/ust/nprocesses/run b/tests/regression/ust/nprocesses/run similarity index 95% rename from tests/ust/nprocesses/run rename to tests/regression/ust/nprocesses/run index f492ed7ed..55ad14811 100755 --- a/tests/ust/nprocesses/run +++ b/tests/regression/ust/nprocesses/run @@ -18,10 +18,10 @@ NR_ITER=100 TEST_DESC="UST tracer - Generate $NR_ITER process" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. TEST_BIN_NAME="gen-events-time" -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/nprocesses/tp.c b/tests/regression/ust/nprocesses/tp.c similarity index 100% rename from tests/ust/nprocesses/tp.c rename to tests/regression/ust/nprocesses/tp.c diff --git a/tests/ust/nprocesses/ust-nprocesses b/tests/regression/ust/nprocesses/ust-nprocesses similarity index 97% rename from tests/ust/nprocesses/ust-nprocesses rename to tests/regression/ust/nprocesses/ust-nprocesses index 90c0c2e9b..e1d3fc6bc 100755 --- a/tests/ust/nprocesses/ust-nprocesses +++ b/tests/regression/ust/nprocesses/ust-nprocesses @@ -16,14 +16,14 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. NR_ITER=$1 TEST_BIN_NAME="gen-events-time" SESSION_NAME="ust-nprocesses" EVENT_NAME="ust_gen_event:tptest" TEST_WAIT_SEC=5 -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh # MUST set TESTDIR before calling those functions diff --git a/tests/ust/nprocesses/ust_gen_event.h b/tests/regression/ust/nprocesses/ust_gen_event.h similarity index 100% rename from tests/ust/nprocesses/ust_gen_event.h rename to tests/regression/ust/nprocesses/ust_gen_event.h diff --git a/tests/ust/overlap/Makefile.am b/tests/regression/ust/overlap/Makefile.am similarity index 100% rename from tests/ust/overlap/Makefile.am rename to tests/regression/ust/overlap/Makefile.am diff --git a/tests/ust/overlap/demo/Makefile.am b/tests/regression/ust/overlap/demo/Makefile.am similarity index 100% rename from tests/ust/overlap/demo/Makefile.am rename to tests/regression/ust/overlap/demo/Makefile.am diff --git a/tests/ust/overlap/demo/demo-trace b/tests/regression/ust/overlap/demo/demo-trace similarity index 100% rename from tests/ust/overlap/demo/demo-trace rename to tests/regression/ust/overlap/demo/demo-trace diff --git a/tests/ust/overlap/demo/demo.c b/tests/regression/ust/overlap/demo/demo.c similarity index 100% rename from tests/ust/overlap/demo/demo.c rename to tests/regression/ust/overlap/demo/demo.c diff --git a/tests/ust/overlap/demo/tp.c b/tests/regression/ust/overlap/demo/tp.c similarity index 100% rename from tests/ust/overlap/demo/tp.c rename to tests/regression/ust/overlap/demo/tp.c diff --git a/tests/ust/overlap/demo/tp2.c b/tests/regression/ust/overlap/demo/tp2.c similarity index 100% rename from tests/ust/overlap/demo/tp2.c rename to tests/regression/ust/overlap/demo/tp2.c diff --git a/tests/ust/overlap/demo/tp3.c b/tests/regression/ust/overlap/demo/tp3.c similarity index 100% rename from tests/ust/overlap/demo/tp3.c rename to tests/regression/ust/overlap/demo/tp3.c diff --git a/tests/ust/overlap/demo/ust_tests_demo.h b/tests/regression/ust/overlap/demo/ust_tests_demo.h similarity index 100% rename from tests/ust/overlap/demo/ust_tests_demo.h rename to tests/regression/ust/overlap/demo/ust_tests_demo.h diff --git a/tests/ust/overlap/demo/ust_tests_demo2.h b/tests/regression/ust/overlap/demo/ust_tests_demo2.h similarity index 100% rename from tests/ust/overlap/demo/ust_tests_demo2.h rename to tests/regression/ust/overlap/demo/ust_tests_demo2.h diff --git a/tests/ust/overlap/demo/ust_tests_demo3.h b/tests/regression/ust/overlap/demo/ust_tests_demo3.h similarity index 100% rename from tests/ust/overlap/demo/ust_tests_demo3.h rename to tests/regression/ust/overlap/demo/ust_tests_demo3.h diff --git a/tests/ust/overlap/overlap.sh b/tests/regression/ust/overlap/overlap.sh similarity index 99% rename from tests/ust/overlap/overlap.sh rename to tests/regression/ust/overlap/overlap.sh index ebe6cfd1a..8498199bd 100755 --- a/tests/ust/overlap/overlap.sh +++ b/tests/regression/ust/overlap/overlap.sh @@ -17,7 +17,7 @@ TEST_DESC="UST - Wildcard overlap" CURDIR=$(dirname $0)/ -TESTDIR=$CURDIR/../.. +TESTDIR=$CURDIR/../../.. SESSION_NAME="wildcard-overlap" DEMO_EVENT1="ust_tests_demo:starting" @@ -30,7 +30,7 @@ NUM_DEMO1_2_EVENT=1 NUM_DEMO2_EVENT=5 NUM_DEMO3_EVENT=1 -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" diff --git a/tests/ust/overlap/run b/tests/regression/ust/overlap/run similarity index 100% rename from tests/ust/overlap/run rename to tests/regression/ust/overlap/run diff --git a/tests/ust/run-ust-global-tests.sh b/tests/regression/ust/run-ust-global-tests.sh similarity index 92% rename from tests/ust/run-ust-global-tests.sh rename to tests/regression/ust/run-ust-global-tests.sh index e1a54ad61..c09f70c26 100755 --- a/tests/ust/run-ust-global-tests.sh +++ b/tests/regression/ust/run-ust-global-tests.sh @@ -2,9 +2,9 @@ SESSIOND_BIN="lttng-sessiond" CURDIR=$(dirname $0) -TESTDIR=$CURDIR/.. +TESTDIR=$CURDIR/../.. -source $TESTDIR/utils.sh +source $TESTDIR/utils/utils.sh tmpdir=`mktemp -d` tests=( $CURDIR/ust_global_event_basic $CURDIR/ust_global_event_wildcard ) diff --git a/tests/ust/runall.sh b/tests/regression/ust/runall.sh similarity index 100% rename from tests/ust/runall.sh rename to tests/regression/ust/runall.sh diff --git a/tests/ust/ust_global_event_basic.c b/tests/regression/ust/ust_global_event_basic.c similarity index 99% rename from tests/ust/ust_global_event_basic.c rename to tests/regression/ust/ust_global_event_basic.c index ad14afbb3..497538bac 100644 --- a/tests/ust/ust_global_event_basic.c +++ b/tests/regression/ust/ust_global_event_basic.c @@ -27,7 +27,7 @@ #include -#include "../utils.h" +#include "utils.h" int lttng_opt_quiet; diff --git a/tests/ust/ust_global_event_wildcard.c b/tests/regression/ust/ust_global_event_wildcard.c similarity index 100% rename from tests/ust/ust_global_event_wildcard.c rename to tests/regression/ust/ust_global_event_wildcard.c diff --git a/tests/utils.h b/tests/utils/utils.h similarity index 100% rename from tests/utils.h rename to tests/utils/utils.h diff --git a/tests/utils.sh b/tests/utils/utils.sh similarity index 99% rename from tests/utils.sh rename to tests/utils/utils.sh index 3bcdcc479..d8cc4630e 100644 --- a/tests/utils.sh +++ b/tests/utils/utils.sh @@ -72,10 +72,10 @@ function validate_kernel_version () return 1 } -# Generate a random string +# Generate a random string # $1 = number of characters; defaults to 16 # $2 = include special characters; 1 = yes, 0 = no; defaults to yes -function randstring() +function randstring() { [ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]" cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-16} -- 2.34.1