From bc2d01d26d95aabf930e91df0450142ea8103b47 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 17 Sep 2015 14:10:50 -0400 Subject: [PATCH] Fix: tests: skip UST perf tests if not root MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some distributions like Debian (e.g. Debian kernel 4.1.0-2-amd64) have some grsecurity options enabled, such as CONFIG_GRKERNSEC_PERF_HARDEN. Unfortunately, this option makes it impossible to use the SW page-fault perf event as a normal user. It only leaves some HW events. However, we can only use SW events within virtual machines. Therefore, only run this test as root for now until we find a better approach. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- tests/fast_regression | 1 - tests/regression/ust/test_event_perf | 15 ++++++++++++--- tests/root_regression | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/fast_regression b/tests/fast_regression index 97f0966f8..7731f5c0c 100644 --- a/tests/fast_regression +++ b/tests/fast_regression @@ -28,4 +28,3 @@ regression/ust/getcpu-override/test_getcpu_override regression/ust/clock-override/test_clock_override regression/ust/test_event_basic regression/ust/test_event_tracef -regression/ust/test_event_perf diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf index 7fb37edfe..7dc21681f 100755 --- a/tests/regression/ust/test_event_perf +++ b/tests/regression/ust/test_event_perf @@ -90,8 +90,17 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" -start_lttng_sessiond +if [ "$(id -u)" == "0" ]; then + isroot=1 +else + isroot=0 +fi + +skip $isroot "Root access is needed. Skipping UST perf tests." ${NUM_TESTS} || +{ + start_lttng_sessiond -test_event_basic + test_event_basic -stop_lttng_sessiond + stop_lttng_sessiond +} diff --git a/tests/root_regression b/tests/root_regression index 194bc59e0..71365759d 100644 --- a/tests/root_regression +++ b/tests/root_regression @@ -12,3 +12,4 @@ regression/tools/filtering/test_invalid_filter regression/tools/filtering/test_unsupported_op regression/tools/filtering/test_valid_filter regression/tools/wildcard/test_event_wildcard +regression/ust/test_event_perf -- 2.34.1