From: "Paul E. McKenney" <[email protected]>
To: [email protected]
Cc: [email protected], [email protected], [email protected],
Willy Tarreau <[email protected]>,
"Paul E . McKenney" <[email protected]>
Subject: [PATCH nolibc 11/18] selftests/nolibc: condition some tests on /proc existence
Date: Wed, 31 Aug 2022 11:21:41 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <20220831182113.GA2697286@paulmck-ThinkPad-P17-Gen-1>
From: Willy Tarreau <[email protected]>
If /proc is not available (program run inside a chroot or without
sufficient permissions), it's better to disable the associated tests.
Some will be preserved like the ones which check for a failure to
create some entries there since they're still supposed to fail.
Signed-off-by: Willy Tarreau <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
---
tools/testing/selftests/nolibc/nolibc-test.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
index a697182c87f57..662dea691749c 100644
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -413,11 +413,15 @@ int test_getdents64(const char *dir)
int run_syscall(int min, int max)
{
struct stat stat_buf;
+ int proc;
int test;
int tmp;
int ret = 0;
void *p1, *p2;
+ /* <proc> indicates whether or not /proc is mounted */
+ proc = stat("/proc", &stat_buf) == 0;
+
for (test = min; test >= 0 && test <= max; test++) {
int llen = 0; // line length
@@ -438,12 +442,12 @@ int run_syscall(int min, int max)
CASE_TEST(chdir_root); EXPECT_SYSZR(1, chdir("/")); break;
CASE_TEST(chdir_dot); EXPECT_SYSZR(1, chdir(".")); break;
CASE_TEST(chdir_blah); EXPECT_SYSER(1, chdir("/blah"), -1, ENOENT); break;
- CASE_TEST(chmod_net); EXPECT_SYSZR(1, chmod("/proc/self/net", 0555)); break;
- CASE_TEST(chmod_self); EXPECT_SYSER(1, chmod("/proc/self", 0555), -1, EPERM); break;
- CASE_TEST(chown_self); EXPECT_SYSER(1, chown("/proc/self", 0, 0), -1, EPERM); break;
+ CASE_TEST(chmod_net); EXPECT_SYSZR(proc, chmod("/proc/self/net", 0555)); break;
+ CASE_TEST(chmod_self); EXPECT_SYSER(proc, chmod("/proc/self", 0555), -1, EPERM); break;
+ CASE_TEST(chown_self); EXPECT_SYSER(proc, chown("/proc/self", 0, 0), -1, EPERM); break;
CASE_TEST(chroot_root); EXPECT_SYSZR(1, chroot("/")); break;
CASE_TEST(chroot_blah); EXPECT_SYSER(1, chroot("/proc/self/blah"), -1, ENOENT); break;
- CASE_TEST(chroot_exe); EXPECT_SYSER(1, chroot("/proc/self/exe"), -1, ENOTDIR); break;
+ CASE_TEST(chroot_exe); EXPECT_SYSER(proc, chroot("/proc/self/exe"), -1, ENOTDIR); break;
CASE_TEST(close_m1); EXPECT_SYSER(1, close(-1), -1, EBADF); break;
CASE_TEST(close_dup); EXPECT_SYSZR(1, close(dup(0))); break;
CASE_TEST(dup_0); tmp = dup(0); EXPECT_SYSNE(1, tmp, -1); close(tmp); break;
@@ -464,7 +468,7 @@ int run_syscall(int min, int max)
CASE_TEST(link_root1); EXPECT_SYSER(1, link("/", "/"), -1, EEXIST); break;
CASE_TEST(link_blah); EXPECT_SYSER(1, link("/proc/self/blah", "/blah"), -1, ENOENT); break;
CASE_TEST(link_dir); EXPECT_SYSER(1, link("/", "/blah"), -1, EPERM); break;
- CASE_TEST(link_cross); EXPECT_SYSER(1, link("/proc/self/net", "/blah"), -1, EXDEV); break;
+ CASE_TEST(link_cross); EXPECT_SYSER(proc, link("/proc/self/net", "/blah"), -1, EXDEV); break;
CASE_TEST(lseek_m1); EXPECT_SYSER(1, lseek(-1, 0, SEEK_SET), -1, EBADF); break;
CASE_TEST(lseek_0); EXPECT_SYSER(1, lseek(0, 0, SEEK_SET), -1, ESPIPE); break;
CASE_TEST(mkdir_root); EXPECT_SYSER(1, mkdir("/", 0755), -1, EEXIST); break;
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-08-31 18:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 18:21 [PATCH nolibc 0/18] nolibc updates for v6.1 Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 01/18] tools/nolibc: make argc 32-bit in riscv startup code Paul E. McKenney
2022-08-31 18:21 ` [PATCH rcu 1/2] torture: Optionally flush printk() buffers before powering off Paul E. McKenney
2022-09-01 9:12 ` John Ogness
2022-09-01 10:17 ` Paul E. McKenney
2022-08-31 18:21 ` [PATCH rcu 2/2] rcutorture: Use the barrier operation specified by cur_ops Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 02/18] tools/nolibc: fix build warning in sys_mmap() when my_syscall6 is not defined Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 03/18] tools/nolibc: make sys_mmap() automatically use the right __NR_mmap definition Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 04/18] selftests/nolibc: add basic infrastructure to ease creation of nolibc tests Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 05/18] selftests/nolibc: support a test definition format Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 06/18] selftests/nolibc: implement a few tests for various syscalls Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 07/18] selftests/nolibc: add a few tests for some libc functions Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 08/18] selftests/nolibc: exit with poweroff on success when getpid() == 1 Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 09/18] selftests/nolibc: on x86, support exiting with isa-debug-exit Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 10/18] selftests/nolibc: recreate and populate /dev and /proc if missing Paul E. McKenney
2022-08-31 18:21 ` Paul E. McKenney [this message]
2022-08-31 18:21 ` [PATCH nolibc 12/18] selftests/nolibc: support glibc as well Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 13/18] selftests/nolibc: add a "kernel" target to build the kernel with the initramfs Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 14/18] selftests/nolibc: add a "defconfig" target Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 15/18] selftests/nolibc: add a "run" target to start the kernel in QEMU Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 16/18] selftests/nolibc: "sysroot" target installs a local copy of the sysroot Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 17/18] selftests/nolibc: add a "help" target Paul E. McKenney
2022-08-31 18:21 ` [PATCH nolibc 18/18] selftests/nolibc: Avoid generated files being committed Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox