On Mon, 29 Jul 2019, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote:
> Commit e846f0dc57f4 ("kbuild: add support for ensuring headers are
> self-contained") replaced the old mechanism we had in i915 to test the
> header files are self-contained, but later commits kept adding Makefiles
> to subdirs. The end result is that after a build we have several
> header_test_* files that are not used. Stop generating them.
>
> Since now it's very simple to add the headers to the list of files to be
> tested, a separate Makefile.header-test is overkill, so embed it in the
> original Makefile.
Sorry, beat you to it with [1], which also uses header-test-pattern-y
instead of $(wildcard).
Thanks,
Jani.
[1] http://patchwork.freedesktop.org/patch/msgid/20190729140847.18557-1-jani.nikula@xxxxxxxxx
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/Makefile | 24 ++++++++++++++++-
> drivers/gpu/drm/i915/Makefile.header-test | 27 -------------------
> drivers/gpu/drm/i915/display/Makefile | 2 +-
> .../gpu/drm/i915/display/Makefile.header-test | 16 -----------
> drivers/gpu/drm/i915/gem/Makefile | 2 +-
> drivers/gpu/drm/i915/gem/Makefile.header-test | 16 -----------
> drivers/gpu/drm/i915/gt/Makefile | 2 +-
> drivers/gpu/drm/i915/gt/Makefile.header-test | 16 -----------
> drivers/gpu/drm/i915/gt/uc/Makefile | 2 +-
> .../gpu/drm/i915/gt/uc/Makefile.header-test | 16 -----------
> 10 files changed, 27 insertions(+), 96 deletions(-)
> delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test
> delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test
> delete mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test
> delete mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test
> delete mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile.header-test
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 42c17a7b0cb0..f11bf0225920 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -32,7 +32,29 @@ subdir-ccflags-y += \
> $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)
>
> # Extra header tests
> -include $(src)/Makefile.header-test
> +header-test-$(CONFIG_DRM_I915_WERROR) := \
> + i915_active_types.h \
> + i915_debugfs.h \
> + i915_drv.h \
> + i915_fixed.h \
> + i915_gem_gtt.h \
> + i915_globals.h \
> + i915_irq.h \
> + i915_params.h \
> + i915_priolist_types.h \
> + i915_pvinfo.h \
> + i915_reg.h \
> + i915_scheduler_types.h \
> + i915_utils.h \
> + i915_vgpu.h \
> + intel_csr.h \
> + intel_drv.h \
> + intel_gvt.h \
> + intel_pm.h \
> + intel_runtime_pm.h \
> + intel_sideband.h \
> + intel_uncore.h \
> + intel_wakeref.h
>
> subdir-ccflags-y += -I$(srctree)/$(src)
>
> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> deleted file mode 100644
> index 59908b067942..000000000000
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -# SPDX-License-Identifier: MIT
> -# Copyright © 2019 Intel Corporation
> -
> -# Test the headers are compilable as standalone units
> -header-test-$(CONFIG_DRM_I915_WERROR) := \
> - i915_active_types.h \
> - i915_debugfs.h \
> - i915_drv.h \
> - i915_fixed.h \
> - i915_gem_gtt.h \
> - i915_globals.h \
> - i915_irq.h \
> - i915_params.h \
> - i915_priolist_types.h \
> - i915_pvinfo.h \
> - i915_reg.h \
> - i915_scheduler_types.h \
> - i915_utils.h \
> - i915_vgpu.h \
> - intel_csr.h \
> - intel_drv.h \
> - intel_gvt.h \
> - intel_pm.h \
> - intel_runtime_pm.h \
> - intel_sideband.h \
> - intel_uncore.h \
> - intel_wakeref.h
> diff --git a/drivers/gpu/drm/i915/display/Makefile b/drivers/gpu/drm/i915/display/Makefile
> index eec6961015a1..12b446a82fef 100644
> --- a/drivers/gpu/drm/i915/display/Makefile
> +++ b/drivers/gpu/drm/i915/display/Makefile
> @@ -2,4 +2,4 @@
> subdir-ccflags-y += -I$(srctree)/$(src)/..
>
> # Extra header tests
> -include $(src)/Makefile.header-test
> +header-test-$(CONFIG_DRM_I915_WERROR) := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
> diff --git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
> deleted file mode 100644
> index fc7d4e5bd2c6..000000000000
> --- a/drivers/gpu/drm/i915/display/Makefile.header-test
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# SPDX-License-Identifier: MIT
> -# Copyright © 2019 Intel Corporation
> -
> -# Test the headers are compilable as standalone units
> -header_test := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
> -
> -quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> -
> -header_test_%.c: %.h
> - $(call cmd,header_test)
> -
> -extra-$(CONFIG_DRM_I915_WERROR) += \
> - $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
> -
> -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
> diff --git a/drivers/gpu/drm/i915/gem/Makefile b/drivers/gpu/drm/i915/gem/Makefile
> index eec6961015a1..83dfec0e698c 100644
> --- a/drivers/gpu/drm/i915/gem/Makefile
> +++ b/drivers/gpu/drm/i915/gem/Makefile
> @@ -2,4 +2,4 @@
> subdir-ccflags-y += -I$(srctree)/$(src)/..
>
> # Extra header tests
> -include $(src)/Makefile.header-test
> +header-test-$(CONFIG_DRM_I915_WERROR) := $(notdir $(wildcard $(src)/*.h))
> diff --git a/drivers/gpu/drm/i915/gem/Makefile.header-test b/drivers/gpu/drm/i915/gem/Makefile.header-test
> deleted file mode 100644
> index 61e06cbb4b32..000000000000
> --- a/drivers/gpu/drm/i915/gem/Makefile.header-test
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# SPDX-License-Identifier: MIT
> -# Copyright © 2019 Intel Corporation
> -
> -# Test the headers are compilable as standalone units
> -header_test := $(notdir $(wildcard $(src)/*.h))
> -
> -quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> -
> -header_test_%.c: %.h
> - $(call cmd,header_test)
> -
> -extra-$(CONFIG_DRM_I915_WERROR) += \
> - $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
> -
> -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
> diff --git a/drivers/gpu/drm/i915/gt/Makefile b/drivers/gpu/drm/i915/gt/Makefile
> index eec6961015a1..83dfec0e698c 100644
> --- a/drivers/gpu/drm/i915/gt/Makefile
> +++ b/drivers/gpu/drm/i915/gt/Makefile
> @@ -2,4 +2,4 @@
> subdir-ccflags-y += -I$(srctree)/$(src)/..
>
> # Extra header tests
> -include $(src)/Makefile.header-test
> +header-test-$(CONFIG_DRM_I915_WERROR) := $(notdir $(wildcard $(src)/*.h))
> diff --git a/drivers/gpu/drm/i915/gt/Makefile.header-test b/drivers/gpu/drm/i915/gt/Makefile.header-test
> deleted file mode 100644
> index 61e06cbb4b32..000000000000
> --- a/drivers/gpu/drm/i915/gt/Makefile.header-test
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# SPDX-License-Identifier: MIT
> -# Copyright © 2019 Intel Corporation
> -
> -# Test the headers are compilable as standalone units
> -header_test := $(notdir $(wildcard $(src)/*.h))
> -
> -quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> -
> -header_test_%.c: %.h
> - $(call cmd,header_test)
> -
> -extra-$(CONFIG_DRM_I915_WERROR) += \
> - $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
> -
> -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
> diff --git a/drivers/gpu/drm/i915/gt/uc/Makefile b/drivers/gpu/drm/i915/gt/uc/Makefile
> index db9718aa3ee9..ffc6e183e924 100644
> --- a/drivers/gpu/drm/i915/gt/uc/Makefile
> +++ b/drivers/gpu/drm/i915/gt/uc/Makefile
> @@ -2,4 +2,4 @@
> subdir-ccflags-y += -I$(srctree)/$(src)/../..
>
> # Extra header tests
> -include $(src)/Makefile.header-test
> +header-test-$(CONFIG_DRM_I915_WERROR) := $(notdir $(wildcard $(src)/*.h))
> diff --git a/drivers/gpu/drm/i915/gt/uc/Makefile.header-test b/drivers/gpu/drm/i915/gt/uc/Makefile.header-test
> deleted file mode 100644
> index 61e06cbb4b32..000000000000
> --- a/drivers/gpu/drm/i915/gt/uc/Makefile.header-test
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# SPDX-License-Identifier: MIT
> -# Copyright © 2019 Intel Corporation
> -
> -# Test the headers are compilable as standalone units
> -header_test := $(notdir $(wildcard $(src)/*.h))
> -
> -quiet_cmd_header_test = HDRTEST $@
> - cmd_header_test = echo "\#include \"$(<F)\"" > $@
> -
> -header_test_%.c: %.h
> - $(call cmd,header_test)
> -
> -extra-$(CONFIG_DRM_I915_WERROR) += \
> - $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
> -
> -clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
