From patchwork Sat Aug 1 16:02:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 11696145 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B8BB138C for ; Sat, 1 Aug 2020 16:02:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A1C02080C for ; Sat, 1 Aug 2020 16:02:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=devup.no header.i=@devup.no header.b="CYM9Ct94" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726764AbgHAQCu (ORCPT ); Sat, 1 Aug 2020 12:02:50 -0400 Received: from out1.migadu.com ([91.121.223.63]:27706 "EHLO out1.migadu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725841AbgHAQCu (ORCPT ); Sat, 1 Aug 2020 12:02:50 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devup.no; s=default; t=1596297768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Ddp9m3oOgNrfXCMtvidZYRUmW1PXkAbWY96WxiYQUo=; b=CYM9Ct94oysUgLULEWCz+QLi/IO9PWeDHUndf+LQf51ZtBP1ZVX3Cx3BV8TxkTrgZv+fUi +8m1fLCnef7/yP6pOTMzoQhT7JagzZwgnqGyASyTNoQHyy2i4NVetE73di0HhcGtV6a9FR tSmcpykHzsnISvlgFSR1GXkU8BIDY9g= From: Marius Bakke To: linux-modules Cc: Lucas De Marchi Subject: [PATCH v2 1/2] testsuite: Add facility to skip tests. Date: Sat, 1 Aug 2020 18:02:21 +0200 Message-Id: <20200801160222.7464-1-marius@devup.no> In-Reply-To: <87k0yipdd7.fsf@gnu.org> References: <87k0yipdd7.fsf@gnu.org> MIME-Version: 1.0 X-Spam-Score: 4.90 Sender: owner-linux-modules@vger.kernel.org Precedence: bulk List-ID: The Makefile helpfully warns that some tests will fail when --sysconfdir != /etc, but there are no provisions to easily disable those. This commit provides an escape hatch. --- testsuite/testsuite.c | 9 +++++++++ testsuite/testsuite.h | 1 + 2 files changed, 10 insertions(+) diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index e46f3d8..05df553 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -37,6 +37,7 @@ #include "testsuite.h" static const char *ANSI_HIGHLIGHT_GREEN_ON = "\x1B[1;32m"; +static const char *ANSI_HIGHLIGHT_YELLOW_ON = "\x1B[1;33m"; static const char *ANSI_HIGHLIGHT_RED_ON = "\x1B[1;31m"; static const char *ANSI_HIGHLIGHT_OFF = "\x1B[0m"; @@ -948,6 +949,14 @@ static inline int test_run_parent(const struct test *t, int fdout[2], int err; bool matchout, match_modules; + if (t->skip) { + LOG("%sSKIPPED%s: %s\n", + ANSI_HIGHLIGHT_YELLOW_ON, ANSI_HIGHLIGHT_OFF, + t->name); + err = EXIT_SUCCESS; + goto exit; + } + /* Close write-fds */ if (t->output.out != NULL) close(fdout[1]); diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h index 7ed96bf..8029c64 100644 --- a/testsuite/testsuite.h +++ b/testsuite/testsuite.h @@ -109,6 +109,7 @@ struct test { const struct keyval *env_vars; bool need_spawn; bool expected_fail; + bool skip; bool print_outputs; } __attribute__((aligned(8))); From patchwork Sat Aug 1 16:02:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 11696147 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B916D138C for ; Sat, 1 Aug 2020 16:02:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1157207FB for ; Sat, 1 Aug 2020 16:02:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=devup.no header.i=@devup.no header.b="HlefGt0s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726748AbgHAQCx (ORCPT ); Sat, 1 Aug 2020 12:02:53 -0400 Received: from out1.migadu.com ([91.121.223.63]:27732 "EHLO out1.migadu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725841AbgHAQCx (ORCPT ); Sat, 1 Aug 2020 12:02:53 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devup.no; s=default; t=1596297770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f2LlhuJWjXirtewQgsWA1cwm0a2pxrj2LsHLsGxo8KE=; b=HlefGt0sFvFdEDAB7TporlXuHmU/e3W4hFyqm7M7Jo7tZ0kZptusAT8cKCNwmybRb4/UOG yJcI6z2CpoMrOOy+nd+xjHEafuN7uaEAsmxRSx8WokCT4NECQ/JZXbXt8A3T7AQqNwTMGi /h9CePN/zkwU89iEcTimwf/T2amdbuA= From: Marius Bakke To: linux-modules Cc: Lucas De Marchi Subject: [PATCH v2 2/2] testsuite: Automatically skip tests that fail when sysconfdir != /etc. Date: Sat, 1 Aug 2020 18:02:22 +0200 Message-Id: <20200801160222.7464-2-marius@devup.no> In-Reply-To: <87k0yipdd7.fsf@gnu.org> References: <87k0yipdd7.fsf@gnu.org> MIME-Version: 1.0 X-Spam-Score: 4.90 Sender: owner-linux-modules@vger.kernel.org Precedence: bulk List-ID: --- Makefile.am | 12 +++++------- configure.ac | 2 ++ testsuite/test-blacklist.c | 3 +++ testsuite/test-depmod.c | 12 ++++++++++++ testsuite/test-modprobe.c | 6 ++++++ 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8eadb99..cfebc37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -265,13 +265,7 @@ TESTSUITE_OVERRIDE_LIBS = \ TESTSUITE_OVERRIDE_LIBS_LDFLAGS = \ avoid-version -module -shared -export-dynamic -rpath /nowhere -ldl -check-sysconfdir: - $(AM_V_at)if test "$(sysconfdir)" != "/etc" -a "$(sysconfdir)" != "/etc/"; then \ - echo "warning: Some tests will fail without --sysconfdir=/etc" >&2; \ - fi -.PHONY: check-sysconfdir - -check-am: rootfs check-sysconfdir +check-am: rootfs EXTRA_DIST += \ @@ -326,6 +320,10 @@ TESTSUITE_LDADD = \ testsuite/libtestsuite.la libkmod/libkmod-internal.la \ shared/libshared.la +if KMOD_SYSCONFDIR_NOT_ETC +TESTSUITE_CPPFLAGS += -DKMOD_SYSCONFDIR_NOT_ETC +endif + check_LTLIBRARIES += testsuite/libtestsuite.la testsuite_libtestsuite_la_SOURCES = \ testsuite/testsuite.c testsuite/testsuite.h diff --git a/configure.ac b/configure.ac index 4a65d6b..2115b03 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) ], [ AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) +# Some tests are skipped when sysconfdir != /etc. +AM_CONDITIONAL([KMOD_SYSCONFDIR_NOT_ETC], [test "x$sysconfdir" != "x/etc"]) ##################################################################### # Default CFLAGS and LDFLAGS diff --git a/testsuite/test-blacklist.c b/testsuite/test-blacklist.c index 969567d..d03eedb 100644 --- a/testsuite/test-blacklist.c +++ b/testsuite/test-blacklist.c @@ -95,6 +95,9 @@ fail_lookup: } DEFINE_TEST(blacklist_1, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modules are correctly blacklisted", .config = { [TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/", diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c index 47dafb4..261559c 100644 --- a/testsuite/test-depmod.c +++ b/testsuite/test-depmod.c @@ -42,6 +42,9 @@ static noreturn int depmod_modules_order_for_compressed(const struct test *t) } DEFINE_TEST(depmod_modules_order_for_compressed, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod let aliases in right order when using compressed modules", .config = { [TC_UNAME_R] = MODULES_ORDER_UNAME, @@ -121,6 +124,9 @@ static noreturn int depmod_detect_loop(const struct test *t) exit(EXIT_FAILURE); } DEFINE_TEST(depmod_detect_loop, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod detects module loops correctly", .config = { [TC_UNAME_R] = "4.4.4", @@ -144,6 +150,9 @@ static noreturn int depmod_search_order_external_first(const struct test *t) exit(EXIT_FAILURE); } DEFINE_TEST(depmod_search_order_external_first, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod honor external keyword with higher priority", .config = { [TC_UNAME_R] = "4.4.4", @@ -196,6 +205,9 @@ static noreturn int depmod_search_order_override(const struct test *t) exit(EXIT_FAILURE); } DEFINE_TEST(depmod_search_order_override, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if depmod honor override keyword", .config = { [TC_UNAME_R] = "4.4.4", diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c index f908d56..f6bed8b 100644 --- a/testsuite/test-modprobe.c +++ b/testsuite/test-modprobe.c @@ -83,6 +83,9 @@ static noreturn int modprobe_show_alias_to_none(const struct test *t) exit(EXIT_FAILURE); } DEFINE_TEST(modprobe_show_alias_to_none, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modprobe --show-depends doesn't explode with an alias to nothing", .config = { [TC_UNAME_R] = "4.4.4", @@ -172,6 +175,9 @@ static noreturn int modprobe_softdep_loop(const struct test *t) exit(EXIT_FAILURE); } DEFINE_TEST(modprobe_softdep_loop, +#if defined(KMOD_SYSCONFDIR_NOT_ETC) + .skip = true, +#endif .description = "check if modprobe breaks softdep loop", .config = { [TC_UNAME_R] = "4.4.4",