* [PATCH] drm/i915: stop genereating old header test files
@ 2019-07-29 22:16 Lucas De Marchi
2019-07-29 23:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Lucas De Marchi @ 2019-07-29 22:16 UTC (permalink / raw)
To: intel-gfx
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.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/Makefile | 24 ++++++++++++++++-
| 27 -------------------
drivers/gpu/drm/i915/display/Makefile | 2 +-
| 16 -----------
drivers/gpu/drm/i915/gem/Makefile | 2 +-
| 16 -----------
drivers/gpu/drm/i915/gt/Makefile | 2 +-
| 16 -----------
drivers/gpu/drm/i915/gt/uc/Makefile | 2 +-
| 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)))
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: stop genereating old header test files
2019-07-29 22:16 [PATCH] drm/i915: stop genereating old header test files Lucas De Marchi
@ 2019-07-29 23:54 ` Patchwork
2019-07-30 0:38 ` ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-07-29 23:54 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: stop genereating old header test files
URL : https://patchwork.freedesktop.org/series/64402/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
10638294b77e drm/i915: stop genereating old header test files
-:54: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#54:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 checks, 50 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: stop genereating old header test files
2019-07-29 22:16 [PATCH] drm/i915: stop genereating old header test files Lucas De Marchi
2019-07-29 23:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-07-30 0:38 ` Patchwork
2019-07-30 9:05 ` [PATCH] " Jani Nikula
2019-07-30 10:30 ` ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-07-30 0:38 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: stop genereating old header test files
URL : https://patchwork.freedesktop.org/series/64402/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6576 -> Patchwork_13791
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/
Known issues
------------
Here are the changes found in Patchwork_13791 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_reloc@basic-write-cpu-noreloc:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/fi-icl-u3/igt@gem_exec_reloc@basic-write-cpu-noreloc.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/fi-icl-u3/igt@gem_exec_reloc@basic-write-cpu-noreloc.html
#### Possible fixes ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [SKIP][3] ([fdo#109271] / [fdo#109278]) -> [PASS][4] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/fi-kbl-7567u/igt@kms_busy@basic-flip-a.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/fi-kbl-7567u/igt@kms_busy@basic-flip-a.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: [FAIL][5] ([fdo#109483]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/fi-icl-u2/igt@kms_chamelium@hdmi-hpd-fast.html
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
Participating hosts (51 -> 45)
------------------------------
Missing (6): fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6576 -> Patchwork_13791
CI-20190529: 20190529
CI_DRM_6576: 4040b4c4ab647422d82100c8b091d34b6a82f572 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5115: 21be7a02ac8a8ff46b561c36a69e4dd5a0c2938b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13791: 10638294b77e37ca549fe37c4c2b961592caeba1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
10638294b77e drm/i915: stop genereating old header test files
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: stop genereating old header test files
2019-07-29 22:16 [PATCH] drm/i915: stop genereating old header test files Lucas De Marchi
2019-07-29 23:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-07-30 0:38 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-07-30 9:05 ` Jani Nikula
2019-07-30 15:13 ` Lucas De Marchi
2019-07-30 10:30 ` ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2019-07-30 9:05 UTC (permalink / raw)
To: Lucas De Marchi, intel-gfx
On Mon, 29 Jul 2019, Lucas De Marchi <lucas.demarchi@intel.com> 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@intel.com
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: stop genereating old header test files
2019-07-29 22:16 [PATCH] drm/i915: stop genereating old header test files Lucas De Marchi
` (2 preceding siblings ...)
2019-07-30 9:05 ` [PATCH] " Jani Nikula
@ 2019-07-30 10:30 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-07-30 10:30 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: stop genereating old header test files
URL : https://patchwork.freedesktop.org/series/64402/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6576_full -> Patchwork_13791_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13791_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_crc@pipe-c-cursor-64x21-random:
- shard-kbl: [PASS][1] -> [INCOMPLETE][2] ([fdo#103665])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-kbl2/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-kbl6/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][3] -> [FAIL][4] ([fdo#105363])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl10/igt@kms_flip@flip-vs-expired-vblank.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl5/igt@kms_flip@flip-vs-expired-vblank.html
- shard-glk: [PASS][5] -> [FAIL][6] ([fdo#105363])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-glk8/igt@kms_flip@flip-vs-expired-vblank.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-glk5/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#100368])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl10/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl5/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#103167])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl9/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-skl: [PASS][13] -> [INCOMPLETE][14] ([fdo#104108]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl8/igt@kms_frontbuffer_tracking@fbc-suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl2/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][17] -> [FAIL][18] ([fdo#108145])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][19] -> [FAIL][20] ([fdo#103166])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109642] / [fdo#111068])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb2/igt@kms_psr2_su@page_flip.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb7/igt@kms_psr2_su@page_flip.html
* igt@kms_vblank@pipe-a-wait-idle-hang:
- shard-iclb: [PASS][23] -> [INCOMPLETE][24] ([fdo#107713])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb7/igt@kms_vblank@pipe-a-wait-idle-hang.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb1/igt@kms_vblank@pipe-a-wait-idle-hang.html
* igt@perf@blocking:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#110728])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl4/igt@perf@blocking.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl2/igt@perf@blocking.html
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +7 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-kbl3/igt@gem_ctx_isolation@rcs0-s3.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-kbl7/igt@gem_ctx_isolation@rcs0-s3.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][29] ([fdo#110854]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb6/igt@gem_exec_balancer@smoke.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb1/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_suspend@basic-s3:
- shard-snb: [DMESG-WARN][31] ([fdo#110684] / [fdo#111115]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-snb6/igt@gem_exec_suspend@basic-s3.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-snb1/igt@gem_exec_suspend@basic-s3.html
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [INCOMPLETE][33] ([fdo#110741]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl6/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl1/igt@kms_cursor_crc@pipe-a-cursor-suspend.html
* igt@kms_cursor_crc@pipe-c-cursor-alpha-opaque:
- shard-kbl: [FAIL][35] ([fdo#103232]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-alpha-opaque.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-alpha-opaque.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [FAIL][37] ([fdo#105363]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][39] ([fdo#105363]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_flip@flip-vs-suspend:
- shard-hsw: [INCOMPLETE][41] ([fdo#103540]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-hsw7/igt@kms_flip@flip-vs-suspend.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-hsw2/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
- shard-iclb: [FAIL][43] ([fdo#103167]) -> [PASS][44] +4 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [DMESG-WARN][45] ([fdo#108566]) -> [PASS][46] +4 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-apl5/igt@kms_frontbuffer_tracking@fbc-suspend.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-apl6/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][47] ([fdo#109441]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][49] ([fdo#99912]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-apl2/igt@kms_setmode@basic.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-apl1/igt@kms_setmode@basic.html
- shard-skl: [FAIL][51] ([fdo#99912]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-skl2/igt@kms_setmode@basic.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-skl2/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-c-wait-forked-busy-hang:
- shard-iclb: [INCOMPLETE][53] ([fdo#107713]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-iclb7/igt@kms_vblank@pipe-c-wait-forked-busy-hang.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-iclb4/igt@kms_vblank@pipe-c-wait-forked-busy-hang.html
* igt@prime_busy@wait-hang-vebox:
- shard-glk: [DMESG-WARN][55] ([fdo#111256]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6576/shard-glk7/igt@prime_busy@wait-hang-vebox.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/shard-glk2/igt@prime_busy@wait-hang-vebox.html
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110684]: https://bugs.freedesktop.org/show_bug.cgi?id=110684
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111115]: https://bugs.freedesktop.org/show_bug.cgi?id=111115
[fdo#111256]: https://bugs.freedesktop.org/show_bug.cgi?id=111256
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6576 -> Patchwork_13791
CI-20190529: 20190529
CI_DRM_6576: 4040b4c4ab647422d82100c8b091d34b6a82f572 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5115: 21be7a02ac8a8ff46b561c36a69e4dd5a0c2938b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13791: 10638294b77e37ca549fe37c4c2b961592caeba1 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13791/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: stop genereating old header test files
2019-07-30 9:05 ` [PATCH] " Jani Nikula
@ 2019-07-30 15:13 ` Lucas De Marchi
0 siblings, 0 replies; 6+ messages in thread
From: Lucas De Marchi @ 2019-07-30 15:13 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Jul 30, 2019 at 12:05:13PM +0300, Jani Nikula wrote:
>On Mon, 29 Jul 2019, Lucas De Marchi <lucas.demarchi@intel.com> 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).
np, as long as I don't see the untracked files, I'm fine :)
Lucas De Marchi
>
>Thanks,
>Jani.
>
>[1] http://patchwork.freedesktop.org/patch/msgid/20190729140847.18557-1-jani.nikula@intel.com
>
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> ---
>> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-30 15:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-29 22:16 [PATCH] drm/i915: stop genereating old header test files Lucas De Marchi
2019-07-29 23:54 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-07-30 0:38 ` ✓ Fi.CI.BAT: success " Patchwork
2019-07-30 9:05 ` [PATCH] " Jani Nikula
2019-07-30 15:13 ` Lucas De Marchi
2019-07-30 10:30 ` ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.