diff options
| -rw-r--r-- | tools/testing/selftests/memfd/Makefile | 6 | ||||
| -rwxr-xr-x | tools/testing/selftests/memfd/run_hugetlbfs_test.sh (renamed from tools/testing/selftests/memfd/run_tests.sh) | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tools/testing/selftests/memfd/Makefile b/tools/testing/selftests/memfd/Makefile index 0862e6f47a38..53a848109f7b 100644 --- a/tools/testing/selftests/memfd/Makefile +++ b/tools/testing/selftests/memfd/Makefile | |||
| @@ -4,9 +4,9 @@ CFLAGS += -I../../../../include/uapi/ | |||
| 4 | CFLAGS += -I../../../../include/ | 4 | CFLAGS += -I../../../../include/ |
| 5 | CFLAGS += -I../../../../usr/include/ | 5 | CFLAGS += -I../../../../usr/include/ |
| 6 | 6 | ||
| 7 | TEST_PROGS := run_tests.sh | 7 | TEST_GEN_PROGS := memfd_test |
| 8 | TEST_FILES := run_fuse_test.sh | 8 | TEST_PROGS := run_fuse_test.sh run_hugetlbfs_test.sh |
| 9 | TEST_GEN_FILES := memfd_test fuse_mnt fuse_test | 9 | TEST_GEN_FILES := fuse_mnt fuse_test |
| 10 | 10 | ||
| 11 | fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) | 11 | fuse_mnt.o: CFLAGS += $(shell pkg-config fuse --cflags) |
| 12 | 12 | ||
diff --git a/tools/testing/selftests/memfd/run_tests.sh b/tools/testing/selftests/memfd/run_hugetlbfs_test.sh index 2013f195e623..fb633eeb0290 100755 --- a/tools/testing/selftests/memfd/run_tests.sh +++ b/tools/testing/selftests/memfd/run_hugetlbfs_test.sh | |||
| @@ -5,12 +5,6 @@ | |||
| 5 | ksft_skip=4 | 5 | ksft_skip=4 |
| 6 | 6 | ||
| 7 | # | 7 | # |
| 8 | # Normal tests requiring no special resources | ||
| 9 | # | ||
| 10 | ./run_fuse_test.sh | ||
| 11 | ./memfd_test | ||
| 12 | |||
| 13 | # | ||
| 14 | # To test memfd_create with hugetlbfs, there needs to be hpages_test | 8 | # To test memfd_create with hugetlbfs, there needs to be hpages_test |
| 15 | # huge pages free. Attempt to allocate enough pages to test. | 9 | # huge pages free. Attempt to allocate enough pages to test. |
| 16 | # | 10 | # |
