From 10f06d76807c3c3ebaec2476fe50d6708d5069e8 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 26 Aug 2025 11:49:47 +0200 Subject: [PATCH] Revert "tests: skip test common/223 in the -Ddefault_library=... jobs" This reverts commit 5ab871be5287aa5cce1e8dfdfb7c4a6b07b4f2f7. It is not needed anymore since the pre-1.8 semantics were the good ones. --- .github/workflows/os_comp.yml | 3 --- test cases/common/223 persubproject options/test.json | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 test cases/common/223 persubproject options/test.json diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 91ca62eed..4b9b7a4a6 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -100,12 +100,10 @@ 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++' @@ -132,7 +130,6 @@ 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 deleted file mode 100644 index ef50ab589..000000000 --- a/test cases/common/223 persubproject options/test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "skip_on_env": ["MESON_TEST_DDEFAULT_LIBRARY"] -}