We have a local hack to test if headers are self-contained, while
upstreaming a proper generic solution in kbuild [1]. Now that both have
found themselves in linux-next, the identical cmd_header_test build
commands conflict, leading to errors such as:
>> drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
>> drivers/gpu/drm/i915/intel_audio.h: No such file or directory
#include "drivers/gpu/drm/i915/intel_audio.h"
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Rename the i915 local build command until the proper kbuild solution
finds its way to Linus' master and gets backported to our tree, and we
can finally switch over.
Note that since the kbuild header test requires CONFIG_HEADER_TEST=y,
and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this is
likely hit only by build test bots.
[1] http://marc.info/?i=20190604124248.5564-1-jani.nikula@xxxxxxxxx
Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
drivers/gpu/drm/i915/Makefile.header-test | 6 +++---
drivers/gpu/drm/i915/gem/Makefile.header-test | 6 +++---
drivers/gpu/drm/i915/gt/Makefile.header-test | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 6ef3b647ac65..1b4537405b4b 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -63,11 +63,11 @@ header_test := \
intel_vdsc.h \
intel_wakeref.h
-quiet_cmd_header_test = HDRTEST $@
- cmd_header_test = echo "\#include \"$(<F)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+ cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
header_test_%.c: %.h
- $(call cmd,header_test)
+ $(call cmd,i915_header_test)
i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
diff --git a/drivers/gpu/drm/i915/gem/Makefile.header-test b/drivers/gpu/drm/i915/gem/Makefile.header-test
index 61e06cbb4b32..50a3aa983659 100644
--- a/drivers/gpu/drm/i915/gem/Makefile.header-test
+++ b/drivers/gpu/drm/i915/gem/Makefile.header-test
@@ -4,11 +4,11 @@
# 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)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+ cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
header_test_%.c: %.h
- $(call cmd,header_test)
+ $(call cmd,i915_header_test)
extra-$(CONFIG_DRM_I915_WERROR) += \
$(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
diff --git a/drivers/gpu/drm/i915/gt/Makefile.header-test b/drivers/gpu/drm/i915/gt/Makefile.header-test
index 61e06cbb4b32..50a3aa983659 100644
--- a/drivers/gpu/drm/i915/gt/Makefile.header-test
+++ b/drivers/gpu/drm/i915/gt/Makefile.header-test
@@ -4,11 +4,11 @@
# 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)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+ cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
header_test_%.c: %.h
- $(call cmd,header_test)
+ $(call cmd,i915_header_test)
extra-$(CONFIG_DRM_I915_WERROR) += \
$(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
