| Message ID | 20180308143741.4415-1-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 55c1b5f4af398f5776add417ddf8ae9cc574f0b7 |
| Headers | show |
| Series | selftests/android/ion: Makefile: fix build error | expand |
On 03/08/2018 06:37 AM, Anders Roxell wrote: > Fails to build iomap_test.c due to missing include > > gcc -I. -I../../../../../drivers/staging/android/uapi/ -Wall -O2 -g > ionmap_test.c ipcsocket.c ionutils.c -o ionmap_test > ionmap_test.c:12:27: fatal error: linux/dma-buf.h: No such file or > directory > #include <linux/dma-buf.h> > ^ > compilation terminated. > <builtin>: recipe for target 'ionmap_test' failed > make[2]: *** [ionmap_test] Error 1 > > In the current code, we add a new -I ../../../../../usr/include/ to the > INCLUDEDIR variable. Also add ionmap_test to the .gitignore file. > > Fixes: ac93f7046a53 ("selftests: ion: Add simple test with the vgem driver") Where is this hash from? It's not in Linus' master branch. Are the /usr/include header properly sanitized, if so that's nice because there's been debates before about how best to pick up the sanitized headers. I see that used several other places around self-tests too. Anyway, you can add Acked-by: Laura Abbott <labbott@redhat.com> Thanks, Laura > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > tools/testing/selftests/android/ion/.gitignore | 1 + > tools/testing/selftests/android/ion/Makefile | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/android/ion/.gitignore b/tools/testing/selftests/android/ion/.gitignore > index 67e6f391b2a9..95e8f4561474 100644 > --- a/tools/testing/selftests/android/ion/.gitignore > +++ b/tools/testing/selftests/android/ion/.gitignore > @@ -1,2 +1,3 @@ > ionapp_export > ionapp_import > +ionmap_test > diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile > index d23b6d537d8b..e03695287f76 100644 > --- a/tools/testing/selftests/android/ion/Makefile > +++ b/tools/testing/selftests/android/ion/Makefile > @@ -1,5 +1,5 @@ > > -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ > +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/ > CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g > > TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test >
On 8 March 2018 at 20:32, Laura Abbott <labbott@redhat.com> wrote: > On 03/08/2018 06:37 AM, Anders Roxell wrote: >> >> Fails to build iomap_test.c due to missing include >> >> gcc -I. -I../../../../../drivers/staging/android/uapi/ -Wall -O2 -g >> ionmap_test.c ipcsocket.c ionutils.c -o ionmap_test >> ionmap_test.c:12:27: fatal error: linux/dma-buf.h: No such file or >> directory >> #include <linux/dma-buf.h> >> ^ >> compilation terminated. >> <builtin>: recipe for target 'ionmap_test' failed >> make[2]: *** [ionmap_test] Error 1 >> >> In the current code, we add a new -I ../../../../../usr/include/ to the >> INCLUDEDIR variable. Also add ionmap_test to the .gitignore file. >> > Fixes: ac93f7046a53 ("selftests: ion: Add simple test with the vgem >> > driver") > > > Where is this hash from? In linux-next. > It's not in Linus' master branch. > Are the /usr/include header properly sanitized That my understanding but please correct me if I'm wrong. Cheers, Anders >, if so that's nice > because there's been debates before about how best to pick up > the sanitized headers. I see that used several other places > around self-tests too. Anyway, you can add > > Acked-by: Laura Abbott <labbott@redhat.com> > > Thanks, > Laura > > >> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> >> --- >> tools/testing/selftests/android/ion/.gitignore | 1 + >> tools/testing/selftests/android/ion/Makefile | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/tools/testing/selftests/android/ion/.gitignore >> b/tools/testing/selftests/android/ion/.gitignore >> index 67e6f391b2a9..95e8f4561474 100644 >> --- a/tools/testing/selftests/android/ion/.gitignore >> +++ b/tools/testing/selftests/android/ion/.gitignore >> @@ -1,2 +1,3 @@ >> ionapp_export >> ionapp_import >> +ionmap_test >> diff --git a/tools/testing/selftests/android/ion/Makefile >> b/tools/testing/selftests/android/ion/Makefile >> index d23b6d537d8b..e03695287f76 100644 >> --- a/tools/testing/selftests/android/ion/Makefile >> +++ b/tools/testing/selftests/android/ion/Makefile >> @@ -1,5 +1,5 @@ >> -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ >> +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ >> -I../../../../../usr/include/ >> CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g >> TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test >> >
On 03/08/2018 04:30 PM, Anders Roxell wrote: > On 8 March 2018 at 20:32, Laura Abbott <labbott@redhat.com> wrote: >> On 03/08/2018 06:37 AM, Anders Roxell wrote: >>> >>> Fails to build iomap_test.c due to missing include >>> >>> gcc -I. -I../../../../../drivers/staging/android/uapi/ -Wall -O2 -g >>> ionmap_test.c ipcsocket.c ionutils.c -o ionmap_test >>> ionmap_test.c:12:27: fatal error: linux/dma-buf.h: No such file or >>> directory >>> #include <linux/dma-buf.h> >>> ^ >>> compilation terminated. >>> <builtin>: recipe for target 'ionmap_test' failed >>> make[2]: *** [ionmap_test] Error 1 >>> >>> In the current code, we add a new -I ../../../../../usr/include/ to the >>> INCLUDEDIR variable. Also add ionmap_test to the .gitignore file. >>>> Fixes: ac93f7046a53 ("selftests: ion: Add simple test with the vgem >>>> driver") >> >> >> Where is this hash from? > > In linux-next. > >> It's not in Linus' master branch. >> Are the /usr/include header properly sanitized > > That my understanding but please correct me if I'm wrong. > > Cheers, > Anders > >> , if so that's nice >> because there's been debates before about how best to pick up >> the sanitized headers. I see that used several other places >> around self-tests too. Anyway, you can add >> >> Acked-by: Laura Abbott <labbott@redhat.com> >> Thanks. Applied to linux-kselftest next for 4.17-rc1 -- Shuah
diff --git a/tools/testing/selftests/android/ion/.gitignore b/tools/testing/selftests/android/ion/.gitignore index 67e6f391b2a9..95e8f4561474 100644 --- a/tools/testing/selftests/android/ion/.gitignore +++ b/tools/testing/selftests/android/ion/.gitignore @@ -1,2 +1,3 @@ ionapp_export ionapp_import +ionmap_test diff --git a/tools/testing/selftests/android/ion/Makefile b/tools/testing/selftests/android/ion/Makefile index d23b6d537d8b..e03695287f76 100644 --- a/tools/testing/selftests/android/ion/Makefile +++ b/tools/testing/selftests/android/ion/Makefile @@ -1,5 +1,5 @@ -INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ +INCLUDEDIR := -I. -I../../../../../drivers/staging/android/uapi/ -I../../../../../usr/include/ CFLAGS := $(CFLAGS) $(INCLUDEDIR) -Wall -O2 -g TEST_GEN_FILES := ionapp_export ionapp_import ionmap_test
Fails to build iomap_test.c due to missing include gcc -I. -I../../../../../drivers/staging/android/uapi/ -Wall -O2 -g ionmap_test.c ipcsocket.c ionutils.c -o ionmap_test ionmap_test.c:12:27: fatal error: linux/dma-buf.h: No such file or directory #include <linux/dma-buf.h> ^ compilation terminated. <builtin>: recipe for target 'ionmap_test' failed make[2]: *** [ionmap_test] Error 1 In the current code, we add a new -I ../../../../../usr/include/ to the INCLUDEDIR variable. Also add ionmap_test to the .gitignore file. Fixes: ac93f7046a53 ("selftests: ion: Add simple test with the vgem driver") Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- tools/testing/selftests/android/ion/.gitignore | 1 + tools/testing/selftests/android/ion/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.11.0