OSDN Git Service

tools/testing/selftests/vm/hmm-tests.c: use the new SKIP() macro
authorRalph Campbell <rcampbell@nvidia.com>
Tue, 13 Oct 2020 23:54:29 +0000 (16:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2020 01:38:32 +0000 (18:38 -0700)
Some tests might not be able to be run if resources like huge pages are
not available.  Mark these tests as skipped instead of simply passing.

Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Shuah Khan <shuah@kernel.org>
Link: http://lkml.kernel.org/r/20200827190400.12608-1-rcampbell@nvidia.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
tools/testing/selftests/vm/hmm-tests.c

index 93fc5ca..0a28a6a 100644 (file)
@@ -680,7 +680,7 @@ TEST_F(hmm, anon_write_hugetlbfs)
 
        n = gethugepagesizes(pagesizes, 4);
        if (n <= 0)
-               return;
+               SKIP(return, "Huge page size could not be determined");
        for (idx = 0; --n > 0; ) {
                if (pagesizes[n] < pagesizes[idx])
                        idx = n;
@@ -694,7 +694,7 @@ TEST_F(hmm, anon_write_hugetlbfs)
        buffer->ptr = get_hugepage_region(size, GHR_STRICT);
        if (buffer->ptr == NULL) {
                free(buffer);
-               return;
+               SKIP(return, "Huge page could not be allocated");
        }
 
        buffer->fd = -1;