From nobody Tue Jun 13 06:04:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QgJ1Q3WmXz4dCnm; Tue, 13 Jun 2023 06:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QgJ1Q3362z3hgy; Tue, 13 Jun 2023 06:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686636298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rx98aAOud1Nklq0kPLZxfAFyZ8wc/IBHnxB592H2Dyk=; b=o7b95J81677GcpUKxMAuucIGRNYHVag0lUSU0qmat/ML3KqaoseylxYDQk6MR8otIwjgoV 68aV2KhDHIkxGWp1SMJvf/Eiam22OmXl1JQYcqLQrc2906FJ1irv5UovdCHzfhU1zU23lX 8V8VS1W/dKvjxFAuaTAAnNt+5bR4XkAH9XxNdBuV/xl6AAYA6b9l7g6Eso10I/EOf3ZsSu acX1g8X4ka7irfThGvU7V6q/oL+f1Qd3risNPNcevlnMUUKLK6FFzTXWM1W+SjqvmPknQK 9VBRygX/aayMZ2i0sF3uxuXRRn/A47EiXUcDcLXvrJlni5JKwmhLaiba0PXdhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686636298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rx98aAOud1Nklq0kPLZxfAFyZ8wc/IBHnxB592H2Dyk=; b=K1/IiDH8Fx0FhjYN0igJuuLWY+wVFaBq0jlz8t9w8oNDIrLGGsLqD8hjjwnY8cZ21uSVr6 AXOZwVZsIcKcQEL7Yfud9xRn+uw1YvIRkL2PiCjAxanfRFp5bYeTQ9gwjA1gQkKkwnTFyu NcSWiXHR4wV2ApqiRS1BKLRlvuJUpmSS9BdcEPm6Unb+sbV7RkI2VKOJVujxY+cTtp1KU3 SvlJaLRZlUIo0L5cII8CfdVd60y/mB5d/yDfgTUUO7ox21iTerWeuONFpB3inORtlBewne 0DWZUsaxZK3vYWTWq71Z59K2n79IFqGJiZXSCPiD4e+5pthRSZKY9dlEy3EN5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686636298; a=rsa-sha256; cv=none; b=xu2BiFCxDXuF6HHvwtzFv6V9ygtqunPAIJ9cX+EeitQ3VSoIO3cRHi5OcntYXK7Y0M7AQE f+NVTEyP3yvaRD+7Z83HUG6rS14c8DqxFHpLx6Jbh+z1o6ZhHewtKSqP5llqBAT/hggabb ugL3/Vf0y4vSpqrMnw4RGscLZ3RkdnWLXW11zRZYMOqR02VKsxbY7JZs84j7Wi0xiwV8PO 4rgJZWAePREC69CZznLJR7LaQRzY331r1iqTjt22woXLXqrb/RBP/OTujwAJOEiGXxbEVr PH+e/ef5U0tJWeTXcHVRP/MSokfuWMdyOMmTXVGLnUChe8Bc/AGZriLgXzF3ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QgJ1Q20fNz19h5; Tue, 13 Jun 2023 06:04:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35D64wTb098466; Tue, 13 Jun 2023 06:04:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D64wDe098465; Tue, 13 Jun 2023 06:04:58 GMT (envelope-from git) Date: Tue, 13 Jun 2023 06:04:58 GMT Message-Id: <202306130604.35D64wDe098465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0eb0d2333546 - main - ktest: make ktest work with Netlink loaded as a module. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eb0d2333546cc2af4027e43a5a254a0e2790dce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0eb0d2333546cc2af4027e43a5a254a0e2790dce commit 0eb0d2333546cc2af4027e43a5a254a0e2790dce Author: Alexander V. Chernikov AuthorDate: 2023-06-01 07:25:41 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-06-13 06:04:14 +0000 ktest: make ktest work with Netlink loaded as a module. MFC after: 2 weeks --- sys/modules/ktest/ktest_example/Makefile | 1 + sys/tests/ktest.h | 3 ++- tests/atf_python/ktest.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile index b4a3e778e2ed..3ca304a19a99 100644 --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -9,5 +9,6 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest_example SRCS= ktest_example.c +SRCS+= opt_netlink.h .include diff --git a/sys/tests/ktest.h b/sys/tests/ktest.h index feadb800551b..c767aa31e8e5 100644 --- a/sys/tests/ktest.h +++ b/sys/tests/ktest.h @@ -94,7 +94,7 @@ static struct ktest_module_info _module_info = { \ }; \ \ static moduledata_t _module_data = { \ - "__" #_n "_module", \ + #_n, \ ktest_default_modevent, \ &_module_info, \ }; \ @@ -102,6 +102,7 @@ static moduledata_t _module_data = { \ DECLARE_MODULE(ktest_##_n, _module_data, SI_SUB_PSEUDO, SI_ORDER_ANY); \ MODULE_VERSION(ktest_##_n, 1); \ MODULE_DEPEND(ktest_##_n, ktestmod, 1, 1, 1); \ +MODULE_DEPEND(ktest_##_n, netlink, 1, 1, 1); \ #endif /* _KERNEL */ diff --git a/tests/atf_python/ktest.py b/tests/atf_python/ktest.py index 4cd9970aaec1..a18f47d1dd06 100644 --- a/tests/atf_python/ktest.py +++ b/tests/atf_python/ktest.py @@ -91,7 +91,7 @@ class KtestLoader(object): ret = [] for rx_msg in NetlinkMultipartIterator(self.nlsock, nlmsg_seq, self.family_id): - # test_msg.print_message() + # rx_msg.print_message() tst = { "mod_name": rx_msg.get_nla(KtestAttrType.KTEST_ATTR_MOD_NAME).text, "name": rx_msg.get_nla(KtestAttrType.KTEST_ATTR_TEST_NAME).text,