Message ID | 20230725164336.57767-1-falcon@tinylab.org (mailing list archive) |
---|---|
State | Accepted |
Commit | e7d0129df681aa23bb6528f44186accc38d655f0 |
Headers | show |
Series | selftests/nolibc: mmap_munmap_good: fix up return value | expand |
On 2023-07-26 00:43:36+0800, Zhangjin Wu wrote: > The other tests use 1 as failure, mmap_munmap_good uses -1 as failure, > let's fix up this. > > Signed-off-by: Zhangjin Wu <falcon@tinylab.org> Reviewed-by: Thomas Weißschuh <linux@weissschuh.net> > --- > > Willy, if it is ok for you, please merge this one to our old queued commit: > > commit 6b3e54d01905 ("selftests/nolibc: add mmap_munmap_good test case") > > --- > tools/testing/selftests/nolibc/nolibc-test.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-)
On Wed, Jul 26, 2023 at 08:16:02AM +0200, Thomas Weißschuh wrote: > On 2023-07-26 00:43:36+0800, Zhangjin Wu wrote: > > The other tests use 1 as failure, mmap_munmap_good uses -1 as failure, > > let's fix up this. > > > > Signed-off-by: Zhangjin Wu <falcon@tinylab.org> > > Reviewed-by: Thomas Weißschuh <linux@weissschuh.net> Applied, thanks to you both. Willy
diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 03b1d30f5507..d892aa403095 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -725,7 +725,7 @@ int test_mmap_munmap(void) page_size = getpagesize(); if (page_size < 0) - return -1; + return 1; /* find a right file to mmap, existed and accessible */ for (i = 0; files[i] != NULL; i++) { @@ -736,7 +736,7 @@ int test_mmap_munmap(void) break; } if (ret == -1) - return ret; + return 1; ret = stat(files[i], &stat_buf); if (ret == -1) @@ -756,7 +756,7 @@ int test_mmap_munmap(void) mem = mmap(NULL, length + offset - pa_offset, PROT_READ, MAP_SHARED, fd, pa_offset); if (mem == MAP_FAILED) { - ret = -1; + ret = 1; goto end; } @@ -764,7 +764,7 @@ int test_mmap_munmap(void) end: close(fd); - return ret; + return !!ret; }
The other tests use 1 as failure, mmap_munmap_good uses -1 as failure, let's fix up this. Signed-off-by: Zhangjin Wu <falcon@tinylab.org> --- Willy, if it is ok for you, please merge this one to our old queued commit: commit 6b3e54d01905 ("selftests/nolibc: add mmap_munmap_good test case") --- tools/testing/selftests/nolibc/nolibc-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)