From 0a1b0ae9d1a1159f29ad061ff68c7126c6681f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 4 Nov 2022 15:46:32 +0100 Subject: [PATCH] Meson build fixes * Add missing files to `tests/meson.build` * Rename meson build workflows to be more easily identifiable --- .github/workflows/linux-meson-builds.yml | 2 +- tests/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-meson-builds.yml b/.github/workflows/linux-meson-builds.yml index 9d9ef773..dec701b6 100644 --- a/.github/workflows/linux-meson-builds.yml +++ b/.github/workflows/linux-meson-builds.yml @@ -1,4 +1,4 @@ -name: Linux builds (basic) using meson build system +name: Linux builds (meson) on: [push, pull_request] diff --git a/tests/meson.build b/tests/meson.build index 8b8fd807..f869b29e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -8,6 +8,7 @@ # define the sources of the self test # Please keep these ordered alphabetically self_test_sources = files( + 'SelfTest/helpers/parse_test_spec.cpp', 'SelfTest/IntrospectiveTests/Clara.tests.cpp', 'SelfTest/IntrospectiveTests/CmdLine.tests.cpp', 'SelfTest/IntrospectiveTests/CmdLineHelpers.tests.cpp', @@ -26,6 +27,7 @@ self_test_sources = files( 'SelfTest/IntrospectiveTests/StringManip.tests.cpp', 'SelfTest/IntrospectiveTests/Tag.tests.cpp', 'SelfTest/IntrospectiveTests/TestCaseInfoHasher.tests.cpp', + 'SelfTest/IntrospectiveTests/TestSpec.tests.cpp', 'SelfTest/IntrospectiveTests/TestSpecParser.tests.cpp', 'SelfTest/IntrospectiveTests/TextFlow.tests.cpp', 'SelfTest/IntrospectiveTests/ToString.tests.cpp', @@ -65,7 +67,7 @@ self_test_sources = files( self_test = executable( 'SelfTest', self_test_sources, - include_directories: '../src', + include_directories: ['../src', './SelfTest'], link_with: [catch2_with_main, catch2], )