[Intel-gfx] [PATCH] drm/i915: rename header test build commands to avoid conflicts

yamada.masahiro at socionext.com yamada.masahiro at socionext.com
Thu Jun 6 03:04:42 UTC 2019


Hi,

> -----Original Message-----
> From: Jani Nikula [mailto:jani.nikula at intel.com]
> Sent: Wednesday, June 05, 2019 10:22 PM
> To: intel-gfx at lists.freedesktop.org
> Cc: jani.nikula at intel.com; kbuild test robot <lkp at intel.com>; Chris Wilson
> <chris at chris-wilson.co.uk>; Yamada, Masahiro/山田 真弘
> <yamada.masahiro at socionext.com>; Sam Ravnborg <sam at ravnborg.org>
> Subject: [PATCH] drm/i915: rename header test build commands to avoid
> conflicts
> 
> 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 at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
> Cc: Sam Ravnborg <sam at ravnborg.org>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---


This is not really queued up yet.

So, we can squash fix-up to avoid 0day bot report.


I attached two patches.

00001-FIXUP1.patch is a one-liner fixup.
If you want to clean up your Makefile by yourself later,
I will squash it.


If you want to switch to the generic notation now,
I will squash 0001-FIXUP2.patch.


Either is OK for me.


Thanks.

Masahiro Yamada

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-FIXUP1.patch
Type: application/octet-stream
Size: 867 bytes
Desc: 0001-FIXUP1.patch
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20190606/4d05befb/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-FIXUP2.patch
Type: application/octet-stream
Size: 1616 bytes
Desc: 0001-FIXUP2.patch
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20190606/4d05befb/attachment-0001.obj>


More information about the Intel-gfx mailing list