On Fri, Sep 15, 2023 at 12:01:13PM +0200, Alexandre Ghiti wrote:

kselftests fails to build because the mm/testcases subdirectory is not created and then the compiler fails to output the binary there.

So fix this by simply removing this subdirectory which is not very useful.

Signed-off-by: Alexandre Ghiti alexghiti@rivosinc.com

tools/testing/selftests/riscv/mm/Makefile | 6 +++--- .../selftests/riscv/mm/{testcases => }/mmap_bottomup.c | 2 +- .../selftests/riscv/mm/{testcases => }/mmap_default.c | 2 +- .../testing/selftests/riscv/mm/{testcases => }/mmap_test.h | 0 .../testing/selftests/riscv/mm/{testcases => }/run_mmap.sh | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_bottomup.c (97%) rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_default.c (97%) rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_test.h (100%) rename tools/testing/selftests/riscv/mm/{testcases => }/run_mmap.sh (100%)

diff --git a/tools/testing/selftests/riscv/mm/Makefile b/tools/testing/selftests/riscv/mm/Makefile index 11e0f0568923..c333263f2b27 100644 --- a/tools/testing/selftests/riscv/mm/Makefile +++ b/tools/testing/selftests/riscv/mm/Makefile @@ -5,11 +5,11 @@ # Additional include paths needed by kselftest.h and local headers CFLAGS += -D_GNU_SOURCE -std=gnu99 -I. -TEST_GEN_FILES := testcases/mmap_default testcases/mmap_bottomup +TEST_GEN_FILES := mmap_default mmap_bottomup -TEST_PROGS := testcases/run_mmap.sh +TEST_PROGS := run_mmap.sh include ../../lib.mk -$(OUTPUT)/mm: testcases/mmap_default.c testcases/mmap_bottomup.c testcases/mmap_tests.h +$(OUTPUT)/mm: mmap_default.c mmap_bottomup.c mmap_tests.h $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c b/tools/testing/selftests/riscv/mm/mmap_bottomup.c similarity index 97% rename from tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c rename to tools/testing/selftests/riscv/mm/mmap_bottomup.c index b29379f7e478..1757d19ca89b 100644 --- a/tools/testing/selftests/riscv/mm/testcases/mmap_bottomup.c +++ b/tools/testing/selftests/riscv/mm/mmap_bottomup.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only #include <sys/mman.h> -#include <testcases/mmap_test.h> +#include <mmap_test.h> #include "../../kselftest_harness.h" diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c b/tools/testing/selftests/riscv/mm/mmap_default.c similarity index 97% rename from tools/testing/selftests/riscv/mm/testcases/mmap_default.c rename to tools/testing/selftests/riscv/mm/mmap_default.c index d1accb91b726..c63c60b9397e 100644 --- a/tools/testing/selftests/riscv/mm/testcases/mmap_default.c +++ b/tools/testing/selftests/riscv/mm/mmap_default.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only #include <sys/mman.h> -#include <testcases/mmap_test.h> +#include <mmap_test.h> #include "../../kselftest_harness.h" diff --git a/tools/testing/selftests/riscv/mm/testcases/mmap_test.h b/tools/testing/selftests/riscv/mm/mmap_test.h similarity index 100% rename from tools/testing/selftests/riscv/mm/testcases/mmap_test.h rename to tools/testing/selftests/riscv/mm/mmap_test.h diff --git a/tools/testing/selftests/riscv/mm/testcases/run_mmap.sh b/tools/testing/selftests/riscv/mm/run_mmap.sh similarity index 100% rename from tools/testing/selftests/riscv/mm/testcases/run_mmap.sh rename to tools/testing/selftests/riscv/mm/run_mmap.sh -- 2.39.2

Fixes the problem.

Reviewed-by: Charlie Jenkins charlie@rivosinc.com

- Charlie