All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: rename header test build commands to avoid conflicts
@ 2019-06-05 13:21 Jani Nikula
  2019-06-05 13:35 ` Sam Ravnborg
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Jani Nikula @ 2019-06-05 13:21 UTC (permalink / raw)
  To: intel-gfx; +Cc: jani.nikula, Masahiro Yamada, Sam Ravnborg

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@intel.com

Reported-by: kbuild test robot <lkp@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-06-07  1:50 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 13:21 [PATCH] drm/i915: rename header test build commands to avoid conflicts Jani Nikula
2019-06-05 13:35 ` Sam Ravnborg
2019-06-05 14:53 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-06-06  3:04 ` [PATCH] " yamada.masahiro
2019-06-06  7:24   ` Jani Nikula
2019-06-06  7:32     ` yamada.masahiro
2019-06-06  8:00       ` Jani Nikula
2019-06-06 12:03         ` Masahiro Yamada
2019-06-06 12:16           ` Jani Nikula
2019-06-07  1:50 ` ✓ 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.