Attachment 133593 Details for Bug 102271 – build: Add -Iinclude to unit tests

[patch] build: Add -Iinclude to unit tests

0001-build-Add-Iinclude-to-unit-tests.patch (text/plain), 2.19 KB, created by Philip Withnall on 2017-08-18 08:16:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2017-08-18 08:16:17 UTC

Size: 2.19 KB

patch

obsolete

>From 0875096a028c5fd01ebc05d9081d58b3c07ff517 Mon Sep 17 00:00:00 2001
>From: Philip Withnall <withnall@endlessm.com>
>Date: Fri, 18 Aug 2017 09:13:33 +0100
>Subject: [PATCH] build: Add -Iinclude to unit tests
>
>It seems the unit tests rely on another part of <linux/input.h> which I
>missed in the previous commit (5cf4b35b).
>
>Signed-off-by: Philip Withnall <withnall@endlessm.com>
>---
> meson.build | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/meson.build b/meson.build
>index 66a187d..f65f931 100644
>--- a/meson.build
>+++ b/meson.build
>@@ -672,7 +672,7 @@ if get_option('tests')
> 	def_LT_VERSION = '-DLIBINPUT_LT_VERSION="@0@:@1@:@2@"'.format(libinput_lt_c, libinput_lt_r, libinput_lt_a)
> 	libinput_test_runner = executable('libinput-test-suite-runner',
> 					  libinput_test_runner_sources,
>-					  include_directories : include_directories('src'),
>+					  include_directories : [includes_src, includes_include],
> 					  dependencies : dep_litest,
> 					  c_args : [ def_LT_VERSION ],
> 					  install : false)
>@@ -683,25 +683,25 @@ if get_option('tests')
> 	# build-test only
>         executable('test-build-pedantic',
> 		   'test/build-pedantic.c',
>-		   include_directories : include_directories('src'),
>+		   include_directories : [includes_src, includes_include],
> 		   c_args : ['-std=c99', '-pedantic', '-Werror'],
> 		   install : false)
> 	# build-test only
>         executable('test-build-std-gnuc90',
> 		   'test/build-pedantic.c',
>-		   include_directories : include_directories('src'),
>+		   include_directories : [includes_src, includes_include],
> 		   c_args : ['-std=gnu90', '-Werror'],
> 		   install : false)
> 	# test for linking with the minimal linker flags
>         executable('test-build-linker',
> 		   'test/build-pedantic.c',
>-		   include_directories : include_directories('src'),
>+		   include_directories : [includes_src, includes_include],
> 		   dependencies : [ dep_libinput, dep_libinput_util ],
> 		   install : false)
> 	# test including from C++
> 	executable('test-build-cxx',
> 		   'test/build-cxx.cc',
>-		   include_directories : include_directories('src'),
>+		   include_directories : [includes_src, includes_include],
> 		   install : false)
> 
> 	valgrind_env = environment()
>-- 
>2.13.5
>

Actions: View | Splinter Review

Attachments on bug 102271: 133571 | 133593

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.