From 336fd0e2cbe068f7f17e746dd8b4f44eb57e8cfe Mon Sep 17 00:00:00 2001 From: Nikolai Artemiev Date: Fri, 22 Jul 2022 09:58:14 +1000 Subject: meson: fix various meson build warnings and formatting - Make run_command() calls check for failures to fix warnings about ignoring errors, see https://github.com/mesonbuild/meson/issues/9300. - Remove `include_directories('../subprojects')` from tests/meson.build. It isn't necessary and caused build warnings due to referencing files outside the tests/ directory. - Fix indent level and formatting in a few places. BUG=none BRANCH=none TEST=meson; ninja; ninja test Change-Id: I17ae0c51d68ed004772a237641f08345f4893200 Signed-off-by: Nikolai Artemiev Reviewed-on: https://review.coreboot.org/c/flashrom/+/66060 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen Reviewed-by: Anastasia Klimchuk --- tests/meson.build | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests') diff --git a/tests/meson.build b/tests/meson.build index 318d4aa74..f6f416f0f 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -11,8 +11,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -root_includes = include_directories('../subprojects') - srcs = [ 'io_mock.c', 'tests.c', @@ -105,7 +103,6 @@ mocks = [ flashrom_tests = executable('flashrom_unit_tests', srcs, - include_directories : root_includes, c_args : [ cargs, '-ffunction-sections', -- cgit v1.2.3