| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4af4d2a5-1503-47c6-8da0-cb7586294f0e@linuxfoundation.org>
Date: Thu, 10 Apr 2025 09:19:42 -0600
From: Shuah Khan <skhan@...uxfoundation.org>
To: Thomas Weißschuh <thomas.weissschuh@...utronix.de>,
Shuah Khan <shuah@...nel.org>, Willy Tarreau <w@....eu>,
Thomas Weißschuh <linux@...ssschuh.net>
Cc: linux-kernel@...r.kernel.org, linux-kselftest@...r.kernel.org,
Shuah Khan <skhan@...uxfoundation.org>
Subject: Re: [PATCH v2 01/32] selftests: harness: Add harness selftest
On 4/7/25 00:52, Thomas Weißschuh wrote:
> Add a selftest for the harness itself so any changes can be validated.
>
kselftest harness?
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@...utronix.de>
> ---
> tools/testing/selftests/Makefile | 1 +
> tools/testing/selftests/kselftest/.gitignore | 1 +
> tools/testing/selftests/kselftest/Makefile | 6 +
> .../testing/selftests/kselftest/harness-selftest.c | 129 +++++++++++++++++++++
> .../selftests/kselftest/harness-selftest.expected | 62 ++++++++++
> .../selftests/kselftest/harness-selftest.sh | 14 +++
> 6 files changed, 213 insertions(+)
>
> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
> index c77c8c8e3d9bdd8047c9cb7722c3830447e504e5..3ce071eefa86af59aadd1df7972fdf3bf6e01d52 100644
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@ -48,6 +48,7 @@ TARGETS += ipc
> TARGETS += ir
> TARGETS += kcmp
> TARGETS += kexec
> +TARGETS += kselftest
kselftest name can be confusing to users since the the test suite is called
kselftest in the main Makefile. Find different name - kselftest_harness?
Also don't add files to selftests/kselftest - create a new directory.
make kselftest (runs the entire suite).
> TARGETS += kvm
> TARGETS += landlock
> TARGETS += lib
> diff --git a/tools/testing/selftests/kselftest/.gitignore b/tools/testing/selftests/kselftest/.gitignore
Add a new directory - kselftest_harness?
> new file mode 100644
> index 0000000000000000000000000000000000000000..9aab194e8ea25a2c5ccc116f9f728b8afd0c51c4
> --- /dev/null
> +++ b/tools/testing/selftests/kselftest/.gitignore
> @@ -0,0 +1 @@
> +/harness-selftest
> diff --git a/tools/testing/selftests/kselftest/Makefile b/tools/testing/selftests/kselftest/Makefile
> new file mode 100644
> index 0000000000000000000000000000000000000000..2f2933553dbc47014d9dfe0b4bd8ad3bc36e38c2
> --- /dev/null
> +++ b/tools/testing/selftests/kselftest/Makefile
Same here - don't put these under selftests/kselftest
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: GPL-2.0
> +
> +TEST_GEN_PROGS_EXTENDED := harness-selftest
> +TEST_PROGS := harness-selftest.sh
> +
> +include ../lib.mk
Need a clean override since you are creatinbg a TMPFILE so it
gets cleaned up.
> diff --git a/tools/testing/selftests/kselftest/harness-selftest.c b/tools/testing/selftests/kselftest/harness-selftest.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..8d39e7a0b99c41a5d33edfe2dbf875cac04c098d
> --- /dev/null
> +++ b/tools/testing/selftests/kselftest/harness-selftest.c
> @@ -0,0 +1,129 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <stdio.h>
> +
> +#ifndef NOLIBC
> +#include <sys/resource.h>
> +#include <sys/prctl.h>
> +#endif
> +
> +/* Avoid any inconsistencies */
> +#define TH_LOG_STREAM stdout
> +
> +#include "../kselftest_harness.h"
> +
> +TEST(standalone_pass) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 0);
> + EXPECT_EQ(0, 0);
> + TH_LOG("after");
> +}
> +
> +TEST(standalone_fail) {
> + TH_LOG("before");
> + EXPECT_EQ(0, 0);
> + EXPECT_EQ(0, 1);
> + ASSERT_EQ(0, 1);
> + TH_LOG("after");
> +}
> +
> +TEST_SIGNAL(signal_pass, SIGUSR1) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 0);
> + TH_LOG("after");
> + kill(getpid(), SIGUSR1);
> +}
> +
> +TEST_SIGNAL(signal_fail, SIGUSR1) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 1);
> + TH_LOG("after");
> + kill(getpid(), SIGUSR1);
> +}
> +
> +FIXTURE(fixture) {
> + pid_t testpid;
> +};
> +
> +FIXTURE_SETUP(fixture) {
> + TH_LOG("setup");
> + self->testpid = getpid();
> +}
> +
> +FIXTURE_TEARDOWN(fixture) {
> + TH_LOG("teardown same-process=%d", self->testpid == getpid());
> +}
> +
> +TEST_F(fixture, pass) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 0);
> + TH_LOG("after");
> +}
> +
> +TEST_F(fixture, fail) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 1);
> + TH_LOG("after");
> +}
> +
> +TEST_F_TIMEOUT(fixture, timeout, 1) {
> + TH_LOG("before");
> + sleep(2);
> + TH_LOG("after");
> +}
> +
> +FIXTURE(fixture_parent) {
> + pid_t testpid;
> +};
> +
> +FIXTURE_SETUP(fixture_parent) {
> + TH_LOG("setup");
> + self->testpid = getpid();
> +}
> +
> +FIXTURE_TEARDOWN_PARENT(fixture_parent) {
> + TH_LOG("teardown same-process=%d", self->testpid == getpid());
> +}
> +
> +TEST_F(fixture_parent, pass) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 0);
> + TH_LOG("after");
> +}
> +
> +FIXTURE(fixture_setup_failure) {
> + pid_t testpid;
> +};
> +
> +FIXTURE_SETUP(fixture_setup_failure) {
> + TH_LOG("setup");
> + self->testpid = getpid();
> + ASSERT_EQ(0, 1);
> +}
> +
> +FIXTURE_TEARDOWN(fixture_setup_failure) {
> + TH_LOG("teardown same-process=%d", self->testpid == getpid());
> +}
> +
> +TEST_F(fixture_setup_failure, pass) {
> + TH_LOG("before");
> + ASSERT_EQ(0, 0);
> + TH_LOG("after");
> +}
> +
> +int main(int argc, char **argv)
> +{
> + /*
> + * The harness uses abort() to signal assertion failures, which triggers coredumps.
> + * This may be useful to debug real failures but not for this selftest, disable them.
> + */
> + struct rlimit rlimit = {
> + .rlim_cur = 0,
> + .rlim_max = 0,
> + };
> +
> + prctl(PR_SET_DUMPABLE, 0, 0, 0, 0);
> + setrlimit(RLIMIT_CORE, &rlimit);
> +
> + return test_harness_run(argc, argv);
> +}
> diff --git a/tools/testing/selftests/kselftest/harness-selftest.expected b/tools/testing/selftests/kselftest/harness-selftest.expected
> new file mode 100644
> index 0000000000000000000000000000000000000000..1aa6461db90d4e7cc0679f19b69aadf4032875ec
> --- /dev/null
> +++ b/tools/testing/selftests/kselftest/harness-selftest.expected
> @@ -0,0 +1,62 @@
> +TAP version 13
> +1..9
> +# Starting 9 tests from 4 test cases.
> +# RUN global.standalone_pass ...
> +# harness-selftest.c:16:standalone_pass:before
> +# harness-selftest.c:19:standalone_pass:after
> +# OK global.standalone_pass
> +ok 1 global.standalone_pass
> +# RUN global.standalone_fail ...
> +# harness-selftest.c:23:standalone_fail:before
> +# harness-selftest.c:25:standalone_fail:Expected 0 (0) == 1 (1)
> +# harness-selftest.c:26:standalone_fail:Expected 0 (0) == 1 (1)
> +# standalone_fail: Test terminated by assertion
> +# FAIL global.standalone_fail
> +not ok 2 global.standalone_fail
> +# RUN global.signal_pass ...
> +# harness-selftest.c:31:signal_pass:before
> +# harness-selftest.c:33:signal_pass:after
> +# OK global.signal_pass
> +ok 3 global.signal_pass
> +# RUN global.signal_fail ...
> +# harness-selftest.c:38:signal_fail:before
> +# harness-selftest.c:39:signal_fail:Expected 0 (0) == 1 (1)
> +# signal_fail: Test terminated by assertion
> +# FAIL global.signal_fail
> +not ok 4 global.signal_fail
> +# RUN fixture.pass ...
> +# harness-selftest.c:49:pass:setup
> +# harness-selftest.c:58:pass:before
> +# harness-selftest.c:60:pass:after
> +# harness-selftest.c:54:pass:teardown same-process=1
> +# OK fixture.pass
> +ok 5 fixture.pass
> +# RUN fixture.fail ...
> +# harness-selftest.c:49:fail:setup
> +# harness-selftest.c:64:fail:before
> +# harness-selftest.c:65:fail:Expected 0 (0) == 1 (1)
> +# harness-selftest.c:54:fail:teardown same-process=1
> +# fail: Test terminated by assertion
> +# FAIL fixture.fail
> +not ok 6 fixture.fail
> +# RUN fixture.timeout ...
> +# harness-selftest.c:49:timeout:setup
> +# harness-selftest.c:70:timeout:before
> +# timeout: Test terminated by timeout
> +# FAIL fixture.timeout
> +not ok 7 fixture.timeout
> +# RUN fixture_parent.pass ...
> +# harness-selftest.c:80:pass:setup
> +# harness-selftest.c:89:pass:before
> +# harness-selftest.c:91:pass:after
> +# harness-selftest.c:85:pass:teardown same-process=0
> +# OK fixture_parent.pass
> +ok 8 fixture_parent.pass
> +# RUN fixture_setup_failure.pass ...
> +# harness-selftest.c:99:pass:setup
> +# harness-selftest.c:101:pass:Expected 0 (0) == 1 (1)
> +# pass: Test terminated by assertion
> +# FAIL fixture_setup_failure.pass
> +not ok 9 fixture_setup_failure.pass
> +# FAILED: 4 / 9 tests passed.
> +# Totals: pass:4 fail:5 xfail:0 xpass:0 skip:0 error:0
> diff --git a/tools/testing/selftests/kselftest/harness-selftest.sh b/tools/testing/selftests/kselftest/harness-selftest.sh
> new file mode 100755
> index 0000000000000000000000000000000000000000..bf691adf0b41aaedb2fbc5f06add9fd1d5689044
> --- /dev/null
> +++ b/tools/testing/selftests/kselftest/harness-selftest.sh
> @@ -0,0 +1,14 @@
> +#!/bin/sh
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Selftest for kselftest_harness.h
> +#
> +
> +DIR="$(dirname $(readlink -f "$0"))"
> +
> +TMPFILE="$(mktemp)"
> +trap 'rm "$TMPFILE"' EXIT
> +
> +$DIR/harness-selftest > "$TMPFILE"
> +
> +diff -u "$DIR"/harness-selftest.expected "$TMPFILE"
This TMPFILE needs to be removed from make clean
>
thanks,
-- Shuah
Powered by blists - more mailing lists