Commit 108e5e68 authored by Madhavan Srinivasan's avatar Madhavan Srinivasan Committed by Michael Ellerman
Browse files

selftests/powerpc: make sub-folders buildable on their own 



Build breaks when executing make with run_tests for sub-folders
under powerpc. This is because, CFLAGS and GIT_VERSION macros are
defined in Makefile of toplevel powerpc folder.

  make: Entering directory '/home/maddy/linux/tools/testing/selftests/powerpc/mm'
  gcc     hugetlb_vs_thp_test.c ../harness.c ../utils.c  -o /home/maddy/selftest_output//hugetlb_vs_thp_test
  hugetlb_vs_thp_test.c:6:10: fatal error: utils.h: No such file or directory
      6 | #include "utils.h"
        |          ^~~~~~~~~
  compilation terminated.

Fix this by adding the flags.mk in each sub-folder Makefile. Also remove
the CFLAGS and GIT_VERSION macros from powerpc/ folder Makefile since
the same is definied in flags.mk

Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240229093711.581230-3-maddy@linux.ibm.com
parent 5553a793

tools/testing/selftests/powerpc/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ ARCH := $(shell echo $(ARCH) | sed -e s/ppc.*/powerpc/) 


ifeq ($(ARCH),powerpc)



GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown")



CFLAGS := -std=gnu99 -O2 -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR)/include $(CFLAGS)



export CFLAGS



SUB_DIRS = alignment		\

	   benchmarks		\

	   cache_shape		\
@@ -46,6 +40,7 @@ $(SUB_DIRS): 
	BUILD_TARGET=$(OUTPUT)/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all



include ../lib.mk

include ./flags.mk



override define RUN_TESTS

	+@for TARGET in $(SUB_DIRS); do \

tools/testing/selftests/powerpc/alignment/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ TEST_GEN_PROGS := copy_first_unaligned alignment_handler 


top_srcdir = ../../../../..

include ../../lib.mk

include ../flags.mk



$(TEST_GEN_PROGS): ../harness.c ../utils.c

tools/testing/selftests/powerpc/benchmarks/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ TEST_FILES := settings 


top_srcdir = ../../../../..

include ../../lib.mk

include ../flags.mk



CFLAGS += -O2

tools/testing/selftests/powerpc/cache_shape/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ TEST_GEN_PROGS := cache_shape 


top_srcdir = ../../../../..

include ../../lib.mk

include ../flags.mk



$(TEST_GEN_PROGS): ../harness.c ../utils.c

tools/testing/selftests/powerpc/copyloops/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ EXTRA_SOURCES := validate.c ../harness.c stubs.S 


top_srcdir = ../../../../..

include ../../lib.mk

include ../flags.mk



# The loops are all 64-bit code

CFLAGS += -m64