From nobody Wed Mar 1 20:39:43 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 4PRmLl3M7hz3vKrq; Wed, 1 Mar 2023 20:39:43 +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 4PRmLl2YNJz4NNQ; Wed, 1 Mar 2023 20:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677703183; 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=RN5NkvfpHQkvlbqIaCJLMOV/461FjAciNIcsi1XLtLw=; b=kVLQujFiPNtmB1EZr0Pu1L9a5N3TXomo/L3BPWPZwuVf13R/k3RR0jrISFBOA9v7qB4BnF dyW+Gji2Kl+dFnX5Np8ZZlwt38nmljCvDC0btSTG5wH7zpOlom0TFsGm7wsHr7bK+0+nDF J5YJ0Jr98hxXnput+3hxO9r1H1G8abqDRlBDWV6lQ+BYHm9SKkirBPAtdFr8mXed5zq9VR 8IbhxkRy6J5R32bwDJcinzi4ufbl6BpM26Pzj4rN0zK6AQXm+wL8vWxEsvzQDearzIBIsu VbqUTqJJZ91O0LeXmXMNXEuWAC3Ky/xvvXp2BLJ2F8zoj4QIaENrfL8bnkQzqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677703183; 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=RN5NkvfpHQkvlbqIaCJLMOV/461FjAciNIcsi1XLtLw=; b=eQSRVdILEYsyrqH+opFIZgGL5lXtVmjfOo4Iz3Kv84t2M4ubVQB5P4u62iQq9x8uXpEAtz U5GZ7FGbShdzdaMWq5Mz3aU4gmtUz4RLdTdMid4AbadCsG/orUqusfk+5ynVj6GavXfbA9 o8T0dX5VfwESAc/UBONHMfx6vjv2ETQjxC9ZgGtpOxplJN+DKlx4QdBH2YEnlP245Fv9pS 1WPwlr9pH6En0EPWVJr2QaLAZP/7q3kln+wY152X7r9aesdzNtQtbQxs8MUFHcSlo+0TvR vYoIr7AF57XkA49l8VXC22q6f76XF0LlaDFuT4LqQgkSBPdxsTqPpCzxXYbmgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677703183; a=rsa-sha256; cv=none; b=VIdU4+bPEGn3RyZ8ENI5cYCxbwRNipv6VQ+KuFzK13uZlm+xeOALWhpQIeEWTDXiuLHUCp eKEW715j3CL4Y3L/KKQEwvcv4VOBXkjSWnZE2j48TTKioay2mBDHfKK5b2nv6t+Ah5gjfC ql9OjvQYskqwrZmuy0GOm1deSsqXay1lO8idVvttnKvv/+f8LrLX0NJZZyrhyvNUBr7U+e 5Xwkin5IUIIXGEeQ+QxXhILq2xJtQof0xVfpkvstgfd95ag3Y9v0x+LtJgbQ7chuy8EDq3 rIjKrcA+fS0H+Ymy4jPQIVcNLovoSze6c6rOMuei6ZoQFzOTt8OQK2RBjpVCcQ== 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 4PRmLl1ZWMzpLx; Wed, 1 Mar 2023 20:39:43 +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 321KdhBY097242; Wed, 1 Mar 2023 20:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321KdhK0097241; Wed, 1 Mar 2023 20:39:43 GMT (envelope-from git) Date: Wed, 1 Mar 2023 20:39:43 GMT Message-Id: <202303012039.321KdhK0097241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0c428864495a - main - sysctl: tests: fix a couple issues 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c428864495af9dc7d2af4d0a5ae21732af9c739 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0c428864495af9dc7d2af4d0a5ae21732af9c739 commit 0c428864495af9dc7d2af4d0a5ae21732af9c739 Author: Kyle Evans AuthorDate: 2023-03-01 20:35:52 +0000 Commit: Kyle Evans CommitDate: 2023-03-01 20:38:46 +0000 sysctl: tests: fix a couple issues The function that sets test case metadata is actually named ${tc}_head rather than ${tc}, so add the suffix. While we're here, hook the tests up to the infrastructure so that they do get run. Sponsored by: Klara, Inc. --- etc/mtree/BSD.tests.dist | 2 ++ sbin/sysctl/Makefile | 5 +++++ sbin/sysctl/tests/sysctl_test.sh | 12 ++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 859b5c5ace7f..f3420369ad80 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -466,6 +466,8 @@ .. route .. + sysctl + .. .. secure lib diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile index 2069bd3382d2..ee6eba9feae5 100644 --- a/sbin/sysctl/Makefile +++ b/sbin/sysctl/Makefile @@ -1,10 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.include + PACKAGE=runtime CONFS= sysctl.conf PROG= sysctl WARNS?= 3 MAN= sysctl.8 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/sbin/sysctl/tests/sysctl_test.sh b/sbin/sysctl/tests/sysctl_test.sh index a26c2c77b998..e932626a9f14 100644 --- a/sbin/sysctl/tests/sysctl_test.sh +++ b/sbin/sysctl/tests/sysctl_test.sh @@ -38,7 +38,7 @@ sysctl_by_name_body() atf_test_case sysctl_nflag -sysctl_nflag() +sysctl_nflag_head() { atf_set "descr" "Verify -n argument" } @@ -49,7 +49,7 @@ sysctl_nflag_body() atf_test_case sysctl_eflag -sysctl_eflag() +sysctl_eflag_head() { atf_set "descr" "Verify -e argument" } @@ -60,7 +60,7 @@ sysctl_eflag_body() atf_test_case sysctl_tflag -sysctl_tflag() +sysctl_tflag_head() { atf_set "descr" "Verify -t argument" } @@ -71,7 +71,7 @@ sysctl_tflag_body() atf_test_case sysctl_dflag -sysctl_dflag() +sysctl_dflag_head() { atf_set "descr" "Verify -d argument" } @@ -82,7 +82,7 @@ sysctl_dflag_body() atf_test_case sysctl_tflag_dflag -sysctl_tflag_dflag() +sysctl_tflag_dflag_head() { atf_set "descr" "Verify -t -d arguments" } @@ -94,7 +94,7 @@ sysctl_tflag_dflag_body() atf_test_case sysctl_nflag_tflag_dflag -sysctl_nflag_tflag_dflag() +sysctl_nflag_tflag_dflag_head() { atf_set "descr" "Verify -n -t -d arguments" }