| Message ID | 20241105202639.1977356-2-cvam0000@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kselftest: tmpfs: Add ksft macros and skip if no root | expand |
On 11/5/24 13:26, Shivam Chaudhary wrote: > Add skip test if not run as root, with an appropriate Warning. > > Add 'ksft_print_header()' and 'ksft_set_plan()' to structure test > outputs more effectively. > > Test logs : > > Before change: > > - Without root > error: unshare, errno 1 > > - With root > No, output > > After change: > > - Without root > TAP version 13 > 1..1 > > - With root > TAP version 13 > 1..1 > > Signed-off-by: Shivam Chaudhary <cvam0000@gmail.com> > --- > > tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c b/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c > index b5c3ddb90942..cdab1e8c0392 100644 > --- a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c > +++ b/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c > @@ -23,10 +23,23 @@ > #include <sys/mount.h> > #include <unistd.h> > > +#include "../kselftest.h" > + > int main(void) > { > int fd; > > + /* Setting up kselftest framework */ > + ksft_print_header(); > + ksft_set_plan(1); > + > + /* Check if test is run as root */ > + if (geteuid()) { > + ksft_print_msg("Skip : Need to run as root"); > + exit(KSFT_SKIP); These two can be replaced by ksft_exit_fail_msg() - refer to the kselftest.h for the right API to use for each of these cases. > + > + } > + > if (unshare(CLONE_NEWNS) == -1) { > if (errno == ENOSYS || errno == EPERM) { > fprintf(stderr, "error: unshare, errno %d\n", errno); thanks, -- Shuah
diff --git a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c b/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c index b5c3ddb90942..cdab1e8c0392 100644 --- a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c +++ b/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c @@ -23,10 +23,23 @@ #include <sys/mount.h> #include <unistd.h> +#include "../kselftest.h" + int main(void) { int fd; + /* Setting up kselftest framework */ + ksft_print_header(); + ksft_set_plan(1); + + /* Check if test is run as root */ + if (geteuid()) { + ksft_print_msg("Skip : Need to run as root"); + exit(KSFT_SKIP); + + } + if (unshare(CLONE_NEWNS) == -1) { if (errno == ENOSYS || errno == EPERM) { fprintf(stderr, "error: unshare, errno %d\n", errno);
Add skip test if not run as root, with an appropriate Warning. Add 'ksft_print_header()' and 'ksft_set_plan()' to structure test outputs more effectively. Test logs : Before change: - Without root error: unshare, errno 1 - With root No, output After change: - Without root TAP version 13 1..1 - With root TAP version 13 1..1 Signed-off-by: Shivam Chaudhary <cvam0000@gmail.com> --- tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)