From 7a805c2f30da1d5738ff111355073286049ec903 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 13 Mar 2017 15:00:33 +0000 Subject: Revert "Always expose IGT subtests for known kernel selftests" This reverts commit 7ab5c97924bf971a348ff4a1768da624ba2f564c. --- tests/drm_mm.c | 17 +---------------- tests/drv_selftest.c | 25 ++----------------------- 2 files changed, 3 insertions(+), 39 deletions(-) (limited to 'tests') diff --git a/tests/drm_mm.c b/tests/drm_mm.c index 2a3212e8..2052b115 100644 --- a/tests/drm_mm.c +++ b/tests/drm_mm.c @@ -28,20 +28,5 @@ IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)" igt_main { - /* - * Set of subtest names that are always exposed by IGT, - * regardless of the running kernel's capabilities. Selftests - * that the kernel has but are not on these lists are also - * exposed. This is a known intentional violation of the - * general rule that subtest enumeration must not change - * depending on the runtime environment. - */ - struct igt_kselftest_mockentry drm_mm_testlist[] = { -#define selftest(n, x) { .name = #n, .do_mock = true }, -#include "drm_mm_selftests.h" -#undef selftest - { NULL, false } - }; - - igt_kselftests("test-drm_mm", NULL, NULL, NULL, drm_mm_testlist); + igt_kselftests("test-drm_mm", NULL, NULL, NULL); } diff --git a/tests/drv_selftest.c b/tests/drv_selftest.c index d9b58d50..96dd8bf1 100644 --- a/tests/drv_selftest.c +++ b/tests/drv_selftest.c @@ -28,27 +28,6 @@ IGT_TEST_DESCRIPTION("Basic unit tests for i915.ko"); igt_main { - /* - * Set of subtest names that are always exposed by IGT, - * regardless of the running kernel's capabilities. Selftests - * that the kernel has but are not on these lists are also - * exposed. This is a known intentional violation of the - * general rule that subtest enumeration must not change - * depending on the runtime environment. - */ - struct igt_kselftest_mockentry i915_mock_testlist[] = { -#define selftest(n, x) { .name = "mock_" #n, .do_mock = true }, -#include "i915_mock_selftests.h" -#undef selftest - { NULL, false } - }; - struct igt_kselftest_mockentry i915_live_testlist[] = { -#define selftest(n, x) { .name = "live_" #n, .do_mock = true }, -#include "i915_live_selftests.h" -#undef selftest - { NULL, false } - }; - - igt_kselftests("i915", "mock_selftests=-1", NULL, "mock", i915_mock_testlist); - igt_kselftests("i915", "live_selftests=-1", "live_selftests", "live", i915_live_testlist); + igt_kselftests("i915", "mock_selftests=-1", NULL, "mock"); + igt_kselftests("i915", "live_selftests=-1", "live_selftests", "live"); } -- cgit v1.2.3