From c42013b60893d4b5f2a498638822672660dc536f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 11 Nov 2022 20:37:53 +0100 Subject: [PATCH] package/archlinux: use a dedicated test target for Emscripten. --- package/archlinux/PKGBUILD-emscripten | 11 ++++++----- package/archlinux/PKGBUILD-emscripten-wasm | 11 ++++++----- package/archlinux/PKGBUILD-emscripten-wasm-webgl2 | 11 ++++++----- package/archlinux/PKGBUILD-emscripten-webgl2 | 11 ++++++----- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index ce3e41aa3..75dc63973 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -24,6 +24,8 @@ build() { cd "$_rootdir/build-emscripten" + # Put tests into a separate target as they take ages to build. They're + # built only inside check() so `makepkg --nocheck` will skip building them. cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ @@ -45,17 +47,16 @@ build() { -DMAGNUM_WITH_WAVAUDIOIMPORTER=ON \ -DMAGNUM_WITH_GL_INFO=ON \ -DMAGNUM_WITH_AL_INFO=ON \ - -DMAGNUM_BUILD_TESTS=OFF \ - -DMAGNUM_BUILD_GL_TESTS=OFF + -DMAGNUM_BUILD_TESTS=ON \ + -DMAGNUM_BUILD_GL_TESTS=ON \ + -DCORRADE_TESTSUITE_TEST_TARGET=build-tests ninja } check() { cd "$_rootdir/build-emscripten" - # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DMAGNUM_BUILD_TESTS=ON -DMAGNUM_BUILD_GL_TESTS=ON - ninja + ninja build-tests CORRADE_TEST_COLOR=ON ctest -j9 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm index 6d1e1a516..dc9ec1e31 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm +++ b/package/archlinux/PKGBUILD-emscripten-wasm @@ -24,6 +24,8 @@ build() { cd "$_rootdir/build-emscripten-wasm" + # Put tests into a separate target as they take ages to build. They're + # built only inside check() so `makepkg --nocheck` will skip building them. cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ @@ -45,17 +47,16 @@ build() { -DMAGNUM_WITH_WAVAUDIOIMPORTER=ON \ -DMAGNUM_WITH_GL_INFO=ON \ -DMAGNUM_WITH_AL_INFO=ON \ - -DMAGNUM_BUILD_TESTS=OFF \ - -DMAGNUM_BUILD_GL_TESTS=OFF + -DMAGNUM_BUILD_TESTS=ON \ + -DMAGNUM_BUILD_GL_TESTS=ON \ + -DCORRADE_TESTSUITE_TEST_TARGET=build-tests ninja } check() { cd "$_rootdir/build-emscripten-wasm" - # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DMAGNUM_BUILD_TESTS=ON -DMAGNUM_BUILD_GL_TESTS=ON - ninja + ninja build-tests CORRADE_TEST_COLOR=ON ctest -j9 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 index ba0d1f63b..d70e74d25 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 @@ -24,6 +24,8 @@ build() { cd "$_rootdir/build-emscripten-wasm-webgl2" + # Put tests into a separate target as they take ages to build. They're + # built only inside check() so `makepkg --nocheck` will skip building them. cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ @@ -46,17 +48,16 @@ build() { -DMAGNUM_WITH_WAVAUDIOIMPORTER=ON \ -DMAGNUM_WITH_GL_INFO=ON \ -DMAGNUM_WITH_AL_INFO=ON \ - -DMAGNUM_BUILD_TESTS=OFF \ - -DMAGNUM_BUILD_GL_TESTS=OFF + -DMAGNUM_BUILD_TESTS=ON \ + -DMAGNUM_BUILD_GL_TESTS=ON \ + -DCORRADE_TESTSUITE_TEST_TARGET=build-tests ninja } check() { cd "$_rootdir/build-emscripten-wasm-webgl2" - # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DMAGNUM_BUILD_TESTS=ON -DMAGNUM_BUILD_GL_TESTS=ON - ninja + ninja build-tests CORRADE_TEST_COLOR=ON ctest -j9 --output-on-failure -E ALTest } diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index 57652a898..3d33acdb2 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -24,6 +24,8 @@ build() { cd "$_rootdir/build-emscripten-webgl2" + # Put tests into a separate target as they take ages to build. They're + # built only inside check() so `makepkg --nocheck` will skip building them. cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ @@ -46,17 +48,16 @@ build() { -DMAGNUM_WITH_WAVAUDIOIMPORTER=ON \ -DMAGNUM_WITH_GL_INFO=ON \ -DMAGNUM_WITH_AL_INFO=ON \ - -DMAGNUM_BUILD_TESTS=OFF \ - -DMAGNUM_BUILD_GL_TESTS=OFF + -DMAGNUM_BUILD_TESTS=ON \ + -DMAGNUM_BUILD_GL_TESTS=ON \ + -DCORRADE_TESTSUITE_TEST_TARGET=build-tests ninja } check() { cd "$_rootdir/build-emscripten-webgl2" - # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DMAGNUM_BUILD_TESTS=ON -DMAGNUM_BUILD_GL_TESTS=ON - ninja + ninja build-tests CORRADE_TEST_COLOR=ON ctest -j9 --output-on-failure -E ALTest }