summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/os_comp.yml3
-rw-r--r--test cases/common/223 persubproject options/test.json3
2 files changed, 6 insertions, 0 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index 4b9b7a4a6..91ca62eed 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -100,10 +100,12 @@ jobs:
- CC: 'gcc'
CXX: 'g++'
- MESON_ARGS: '--unity=on -Ddefault_library=static'
+ MESON_TEST_DDEFAULT_LIBRARY: yes
RUN_TESTS_ARGS: '--no-unittests'
CC: 'gcc'
CXX: 'g++'
- MESON_ARGS: '-Ddefault_library=both'
+ MESON_TEST_DDEFAULT_LIBRARY: yes
RUN_TESTS_ARGS: '--no-unittests'
CC: 'gcc'
CXX: 'g++'
@@ -130,6 +132,7 @@ jobs:
env:
MESON_RSP_THRESHOLD: ${{ matrix.cfg.MESON_RSP_THRESHOLD }}
MESON_ARGS: ${{ matrix.cfg.MESON_ARGS }}
+ MESON_TEST_DDEFAULT_LIBRARY: ${{ matrix.cfg.MESON_TEST_DDEFAULT_LIBRARY }}
RUN_TESTS_ARGS: ${{ matrix.cfg.RUN_TESTS_ARGS }}
CC: ${{ matrix.cfg.CC }}
CXX: ${{ matrix.cfg.CXX }}
diff --git a/test cases/common/223 persubproject options/test.json b/test cases/common/223 persubproject options/test.json
new file mode 100644
index 000000000..ef50ab589
--- /dev/null
+++ b/test cases/common/223 persubproject options/test.json
@@ -0,0 +1,3 @@
+{
+ "skip_on_env": ["MESON_TEST_DDEFAULT_LIBRARY"]
+}