From 375af3551d2e302f5d21159dd8a693be33001270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 28 Sep 2018 21:43:27 +0200 Subject: [PATCH] package/archlinux: explicitly build also GL tests for Emscripten. --- package/archlinux/PKGBUILD-emscripten | 5 +++-- package/archlinux/PKGBUILD-emscripten-wasm | 5 +++-- package/archlinux/PKGBUILD-emscripten-wasm-webgl2 | 5 +++-- package/archlinux/PKGBUILD-emscripten-webgl2 | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index b7f4a70f3..65fb27634 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -44,7 +44,8 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_GL_INFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + -DBUILD_GL_TESTS=OFF ninja } @@ -52,7 +53,7 @@ check() { cd "$_rootdir/build-emscripten" # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DBUILD_TESTS=ON + cmake . -DBUILD_TESTS=ON -DBUILD_GL_TESTS=ON ninja CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm index 0759e5b74..ef1e31ed2 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm +++ b/package/archlinux/PKGBUILD-emscripten-wasm @@ -44,7 +44,8 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_GL_INFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + -DBUILD_GL_TESTS=OFF ninja } @@ -52,7 +53,7 @@ check() { cd "$_rootdir/build-emscripten-wasm" # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DBUILD_TESTS=ON + cmake . -DBUILD_TESTS=ON -DBUILD_GL_TESTS=ON ninja CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 index 1c7285109..03daaaacd 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 @@ -45,7 +45,8 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_GL_INFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + -DBUILD_GL_TESTS=OFF ninja } @@ -53,7 +54,7 @@ check() { cd "$_rootdir/build-emscripten-wasm-webgl2" # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DBUILD_TESTS=ON + cmake . -DBUILD_TESTS=ON -DBUILD_GL_TESTS=ON ninja CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index d043aaced..a49dfd07a 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -45,7 +45,8 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_GL_INFO=ON \ -DWITH_AL_INFO=ON \ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + -DBUILD_GL_TESTS=OFF ninja } @@ -53,7 +54,7 @@ check() { cd "$_rootdir/build-emscripten-webgl2" # So tests are not even built (takes AGES) when the user doesn't want to - cmake . -DBUILD_TESTS=ON + cmake . -DBUILD_TESTS=ON -DBUILD_GL_TESTS=ON ninja CORRADE_TEST_COLOR=ON ctest -j5 --output-on-failure -E ALTest