diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 3eb08bacf..bf31bda38 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -381,6 +381,11 @@ jobs: # STUPID yml interprets unquoted ON as a boolean # https://stackoverflow.com/questions/53648244/specifying-the-string-value-yes-in-a-yaml-property BUILD_STATIC: "ON" + # Testing magnum-sceneconverter and other utilities requires the plugins + # to be either installed or static. Tests are however deliberately run + # before install, so the static builds are the only case where the + # utilities get thoroughly tested. + EXTRA_OPTS: -DMAGNUM_SCENECONVERTER_STATIC_PLUGINS=Magnum::AnySceneImporter;Magnum::ObjImporter CMAKE_CXX_FLAGS: --coverage LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8 CONFIGURATION: Debug @@ -514,6 +519,9 @@ jobs: environment: # STUPID yml interprets unquoted ON as a boolean BUILD_STATIC: "ON" + # Same comment as with the linux-static build -- these are the only jobs + # that test command-line tools thoroughly + EXTRA_OPTS: -DMAGNUM_SCENECONVERTER_STATIC_PLUGINS=Magnum::AnySceneImporter;Magnum::ObjImporter CMAKE_CXX_FLAGS: --coverage CONFIGURATION: Debug PLATFORM_GL_API: CGL diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index 49369492b..ebcd06608 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -65,6 +65,7 @@ cmake .. \ -DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \ -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \ -DMAGNUM_BUILD_PLUGINS_STATIC=$BUILD_STATIC \ + $EXTRA_OPTS \ -G Ninja ninja $NINJA_JOBS ASAN_OPTIONS="color=always" LSAN_OPTIONS="color=always suppressions=$(pwd)/../package/ci/leaksanitizer.conf" TSAN_OPTIONS="color=always" CORRADE_TEST_COLOR=ON ctest -V -E "GLTest|GLBenchmark|VkTest"