Fix compilation error
diff mbox series

Message ID 1536918418-5016-1-git-send-email-alexey.skidanov@intel.com
State Accepted
Headers show
Series
  • Fix compilation error
Related show

Commit Message

Alexey Skidanov Sept. 14, 2018, 9:46 a.m. UTC
ionmap_test compilation failed because there is no dma_buf.h on any of
include paths. Moreover, it's better to use the dma_buf.h file of
kernel under test and not the currently running one.

To fix this, add new target to the Makefile, installing Kernel headers
for user space and direct compiler to look for dma_buf.h file there.

Signed-off-by: Alexey Skidanov <alexey.skidanov@intel.com>
---
 tools/testing/selftests/android/ion/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Laura Abbott Sept. 14, 2018, 6:30 p.m. UTC | #1
On 09/14/2018 02:46 AM, Alexey Skidanov wrote:
> ionmap_test compilation failed because there is no dma_buf.h on any of
> include paths. Moreover, it's better to use the dma_buf.h file of
> kernel under test and not the currently running one.
> 
> To fix this, add new target to the Makefile, installing Kernel headers
> for user space and direct compiler to look for dma_buf.h file there.
> 

This is what gpio has:

../../../../usr/include/linux/gpio.h:
         make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/

I'd like to be consistent with other selftests. Shuah, what's
your opinion on the best way to get the headers?

Thanks,
Laura

> Signed-off-by: Alexey Skidanov <alexey.skidanov@intel.com>
> ---
>   tools/testing/selftests/android/ion/Makefile | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile
> index e036952..a4aac0e 100644
> --- a/tools/testing/selftests/android/ion/Makefile
> +++ b/tools/testing/selftests/android/ion/Makefile
> @@ -1,10 +1,14 @@
>   
> -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/
> +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../uapi/include
>   CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g
>   
>   TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test
>   
> -all: $(TEST_GEN_FILES)
> +all: usr_headers $(TEST_GEN_FILES)
> +
> +usr_headers:
> +	cd ../../../../../
> +	make headers_install INSTALL_HDR_PATH=./uapi
>   
>   $(TEST_GEN_FILES): ipcsocket.c ionutils.c
>   
>
Daniel Díaz Sept. 14, 2018, 7:02 p.m. UTC | #2
Hello!

On Fri, 14 Sep 2018 at 13:30, Laura Abbott <labbott@redhat.com> wrote:
>
> On 09/14/2018 02:46 AM, Alexey Skidanov wrote:
> > ionmap_test compilation failed because there is no dma_buf.h on any of
> > include paths. Moreover, it's better to use the dma_buf.h file of
> > kernel under test and not the currently running one.
> >
> > To fix this, add new target to the Makefile, installing Kernel headers
> > for user space and direct compiler to look for dma_buf.h file there.
> >
>
> This is what gpio has:
>
> ../../../../usr/include/linux/gpio.h:
>          make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/
>
> I'd like to be consistent with other selftests. Shuah, what's
> your opinion on the best way to get the headers?

Please consider Anders' patch, which is already in Shuah's next branch:
  https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=next&id=b2d35fa5fc80c27e868e393dcab4c94a0d71737f

Greetings!

Daniel Díaz
daniel.diaz@linaro.org


> Thanks,
> Laura
>
> > Signed-off-by: Alexey Skidanov <alexey.skidanov@intel.com>
> > ---
> >   tools/testing/selftests/android/ion/Makefile | 8 ++++++--
> >   1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile
> > index e036952..a4aac0e 100644
> > --- a/tools/testing/selftests/android/ion/Makefile
> > +++ b/tools/testing/selftests/android/ion/Makefile
> > @@ -1,10 +1,14 @@
> >
> > -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/
> > +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../uapi/include
> >   CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g
> >
> >   TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test
> >
> > -all: $(TEST_GEN_FILES)
> > +all: usr_headers $(TEST_GEN_FILES)
> > +
> > +usr_headers:
> > +     cd ../../../../../
> > +     make headers_install INSTALL_HDR_PATH=./uapi
> >
> >   $(TEST_GEN_FILES): ipcsocket.c ionutils.c
> >
> >
>
Alexey Skidanov Sept. 14, 2018, 7:53 p.m. UTC | #3
On 09/14/2018 10:02 PM, Daniel Díaz wrote:
> Hello!
> 
> On Fri, 14 Sep 2018 at 13:30, Laura Abbott <labbott@redhat.com> wrote:
>>
>> On 09/14/2018 02:46 AM, Alexey Skidanov wrote:
>>> ionmap_test compilation failed because there is no dma_buf.h on any of
>>> include paths. Moreover, it's better to use the dma_buf.h file of
>>> kernel under test and not the currently running one.
>>>
>>> To fix this, add new target to the Makefile, installing Kernel headers
>>> for user space and direct compiler to look for dma_buf.h file there.
>>>
>>
>> This is what gpio has:
>>
>> ../../../../usr/include/linux/gpio.h:
>>          make -C ../../../.. headers_install INSTALL_HDR_PATH=$(shell pwd)/../../../../usr/
>>
>> I'd like to be consistent with other selftests. Shuah, what's
>> your opinion on the best way to get the headers?
> 
> Please consider Anders' patch, which is already in Shuah's next branch:
>   https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=next&id=b2d35fa5fc80c27e868e393dcab4c94a0d71737f
> 
> Greetings!
> 
> Daniel Díaz
> daniel.diaz@linaro.org
> 
> 

Looks like the issue is already resolved :)
>> Thanks,
>> Laura
>>
>>> Signed-off-by: Alexey Skidanov <alexey.skidanov@intel.com>
>>> ---
>>>   tools/testing/selftests/android/ion/Makefile | 8 ++++++--
>>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile
>>> index e036952..a4aac0e 100644
>>> --- a/tools/testing/selftests/android/ion/Makefile
>>> +++ b/tools/testing/selftests/android/ion/Makefile
>>> @@ -1,10 +1,14 @@
>>>
>>> -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/
>>> +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../uapi/include
>>>   CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g
>>>
>>>   TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test
>>>
>>> -all: $(TEST_GEN_FILES)
>>> +all: usr_headers $(TEST_GEN_FILES)
>>> +
>>> +usr_headers:
>>> +     cd ../../../../../
>>> +     make headers_install INSTALL_HDR_PATH=./uapi
>>>
>>>   $(TEST_GEN_FILES): ipcsocket.c ionutils.c
>>>
>>>
>>

Patch
diff mbox series

diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile
index e036952..a4aac0e 100644
--- a/tools/testing/selftests/android/ion/Makefile
+++ b/tools/testing/selftests/android/ion/Makefile
@@ -1,10 +1,14 @@ 
 
-INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/
+INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../uapi/include
 CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g
 
 TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test
 
-all: $(TEST_GEN_FILES)
+all: usr_headers $(TEST_GEN_FILES)
+
+usr_headers:
+	cd ../../../../../
+	make headers_install INSTALL_HDR_PATH=./uapi
 
 $(TEST_GEN_FILES): ipcsocket.c ionutils.c