1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00

Merge branch 'ci_tests_debug' into 'master'

Add CI jobs to build tests in debug mode

See merge request OpenMW/openmw!1006
This commit is contained in:
psi29a 2021-07-11 19:06:13 +00:00
commit ba3d66503f
3 changed files with 26 additions and 2 deletions

View File

@ -76,6 +76,15 @@ Debian_GCC_tests:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
Debian_GCC_tests_Debug:
extends: Debian_GCC
cache:
key: Debian_GCC_tests_Debug.v1
variables:
CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1
CMAKE_BUILD_TYPE: Debug
Debian_GCC_Static_Deps: Debian_GCC_Static_Deps:
extends: Debian_GCC extends: Debian_GCC
cache: cache:
@ -118,6 +127,15 @@ Debian_Clang_tests:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
Debian_Clang_tests_Debug:
extends: Debian_Clang
cache:
key: Debian_Clang_tests_Debug.v1
variables:
CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1
CMAKE_BUILD_TYPE: Debug
.MacOS: .MacOS:
image: macos-11-xcode-12 image: macos-11-xcode-12
tags: tags:

View File

@ -34,6 +34,12 @@ if [[ $CI_OPENMW_USE_STATIC_DEPS ]]; then
) )
fi fi
if [[ "${CMAKE_BUILD_TYPE}" ]]; then
CMAKE_CONF_OPTS+=(
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
)
fi
mkdir -p build mkdir -p build
cd build cd build

View File

@ -703,8 +703,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
mCfgMgr.getScreenshotPath().string(), mCfgMgr.getScreenshotPath().string(),
Settings::Manager::getString("screenshot format", "General"), Settings::Manager::getString("screenshot format", "General"),
Settings::Manager::getBool("notify on saved screenshot", "General") Settings::Manager::getBool("notify on saved screenshot", "General")
? std::function(ScheduleNonDialogMessageBox {}) ? std::function<void (std::string)>(ScheduleNonDialogMessageBox {})
: std::function(IgnoreString {}) : std::function<void (std::string)>(IgnoreString {})
) )
); );