ic
/
magnum-bindings
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Bootstrap for C++-side unit tests. 

So far all tests were done only in Python, but now we'll need them in
CMake / CTest also.
pull/9/head
Vladimír Vondruš 6 years ago
parent
b1d45fc85a
commit
fe7e6eb545
7 changed files with 36 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      CMakeLists.txt
  2. 4
      package/archlinux/PKGBUILD
  3. 1
      package/archlinux/PKGBUILD-coverage
  4. 9
      package/ci/appveyor-desktop-gles.bat
  5. 9
      package/ci/appveyor-desktop.bat
  6. 5
      package/ci/travis-desktop-gles.sh
  7. 5
      package/ci/travis-desktop.sh

9
CMakeLists.txt
Unescape View File

@ -37,6 +37,15 @@ include(CMakeDependentOption)
# Libraries to build # Libraries to build
option(WITH_PYTHON "Build Python bindings" OFF) option(WITH_PYTHON "Build Python bindings" OFF)
option(BUILD_TESTS "Build unit tests" OFF)
if(BUILD_TESTS)
find_package(Corrade REQUIRED TestSuite)
if(CORRADE_TARGET_IOS)
set(CORRADE_TESTSUITE_BUNDLE_IDENTIFIER_PREFIX "cz.mosra.magnum-bindings")
endif()
enable_testing()
endif()
set(MAGNUMBINDINGS_CMAKE_MODULE_INSTALL_DIR share/cmake/MagnumBindings) set(MAGNUMBINDINGS_CMAKE_MODULE_INSTALL_DIR share/cmake/MagnumBindings)

4
package/archlinux/PKGBUILD
Unescape View File

@ -24,11 +24,15 @@ build() {
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_PYTHON=ON \ -DWITH_PYTHON=ON \
-DBUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
} }
check() { check() {
cd "$_rootdir/build"
CORRADE_TEST_COLOR=ON ctest --output-on-failure
cd "$_rootdir/src/python/corrade" cd "$_rootdir/src/python/corrade"
python -m unittest -v python -m unittest -v

1
package/archlinux/PKGBUILD-coverage
Unescape View File

@ -25,6 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_PYTHON=ON \ -DWITH_PYTHON=ON \
-DBUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
} }

9
package/ci/appveyor-desktop-gles.bat
Unescape View File

@ -24,7 +24,7 @@ cmake .. ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DBUILD_STATIC=%BUILD_STATIC% ^
-DWITH_INTERCONNECT=OFF ^ -DWITH_INTERCONNECT=OFF ^
-DWITH_PLUGINMANAGER=ON ^ -DWITH_PLUGINMANAGER=ON ^
-DWITH_TESTSUITE=OFF ^ -DWITH_TESTSUITE=ON ^
-DUTILITY_USE_ANSI_COLORS=ON ^ -DUTILITY_USE_ANSI_COLORS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
@ -87,15 +87,20 @@ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.6 ^
-DWITH_PYTHON=ON ^ -DWITH_PYTHON=ON ^
-DBUILD_TESTS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
rem Test
set CORRADE_TEST_COLOR=ON
ctest -V -E GLTest || exit /b
rem Verify the setuptools install rem Verify the setuptools install
cd src/python || exit /b cd src/python || exit /b
python setup.py install --root="%APPVEYOR_BUILD_FOLDER%/install" || exit /b python setup.py install --root="%APPVEYOR_BUILD_FOLDER%/install" || exit /b
rem Run tests & gather coverage rem Run python tests & gather coverage
cd ../../../src/python/corrade || exit /b cd ../../../src/python/corrade || exit /b
coverage run -m unittest -v || exit /b coverage run -m unittest -v || exit /b
cp .coverage ../.coverage.corrade || exit /b cp .coverage ../.coverage.corrade || exit /b

9
package/ci/appveyor-desktop.bat
Unescape View File

@ -26,7 +26,7 @@ cmake .. ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DBUILD_STATIC=%BUILD_STATIC% ^
-DWITH_INTERCONNECT=OFF ^ -DWITH_INTERCONNECT=OFF ^
-DWITH_PLUGINMANAGER=ON ^ -DWITH_PLUGINMANAGER=ON ^
-DWITH_TESTSUITE=OFF ^ -DWITH_TESTSUITE=ON ^
-DUTILITY_USE_ANSI_COLORS=ON ^ -DUTILITY_USE_ANSI_COLORS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
@ -88,15 +88,20 @@ cmake .. ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.6 ^
-DWITH_PYTHON=ON ^ -DWITH_PYTHON=ON ^
-DBUILD_TESTS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
rem Test
set CORRADE_TEST_COLOR=ON
ctest -V -E GLTest || exit /b
rem Verify the setuptools install rem Verify the setuptools install
cd src/python || exit /b cd src/python || exit /b
python setup.py install --root="%APPVEYOR_BUILD_FOLDER%/install" || exit /b python setup.py install --root="%APPVEYOR_BUILD_FOLDER%/install" || exit /b
rem Run tests & gather coverage rem Run python tests & gather coverage
cd ../../../src/python/corrade || exit /b cd ../../../src/python/corrade || exit /b
coverage run -m unittest -v || exit /b coverage run -m unittest -v || exit /b
cp .coverage ../.coverage.corrade || exit /b cp .coverage ../.coverage.corrade || exit /b

5
package/ci/travis-desktop-gles.sh
Unescape View File

@ -12,7 +12,7 @@ cmake .. \
-DBUILD_DEPRECATED=OFF \ -DBUILD_DEPRECATED=OFF \
-DWITH_INTERCONNECT=OFF \ -DWITH_INTERCONNECT=OFF \
-DWITH_PLUGINMANAGER=ON \ -DWITH_PLUGINMANAGER=ON \
-DWITH_TESTSUITE=OFF \ -DWITH_TESTSUITE=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..
@ -78,9 +78,12 @@ cmake .. \
-DCMAKE_INSTALL_RPATH=$HOME/swiftshader \ -DCMAKE_INSTALL_RPATH=$HOME/swiftshader \
-DPYBIND11_PYTHON_VERSION=3.6 \ -DPYBIND11_PYTHON_VERSION=3.6 \
-DWITH_PYTHON=ON \ -DWITH_PYTHON=ON \
-DBUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
CORRADE_TEST_COLOR=ON ctest -V
# Verify the setuptools install # Verify the setuptools install
cd src/python cd src/python
python3 setup.py install --root="$TRAVIS_BUILD_DIR/install" --prefix=/usr python3 setup.py install --root="$TRAVIS_BUILD_DIR/install" --prefix=/usr

5
package/ci/travis-desktop.sh
Unescape View File

@ -13,7 +13,7 @@ cmake .. \
-DBUILD_STATIC=$BUILD_STATIC \ -DBUILD_STATIC=$BUILD_STATIC \
-DWITH_INTERCONNECT=OFF \ -DWITH_INTERCONNECT=OFF \
-DWITH_PLUGINMANAGER=ON \ -DWITH_PLUGINMANAGER=ON \
-DWITH_TESTSUITE=OFF \ -DWITH_TESTSUITE=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..
@ -72,9 +72,12 @@ cmake .. \
-DCMAKE_PREFIX_PATH=$HOME/pybind11 \ -DCMAKE_PREFIX_PATH=$HOME/pybind11 \
-DPYBIND11_PYTHON_VERSION=3.6 \ -DPYBIND11_PYTHON_VERSION=3.6 \
-DWITH_PYTHON=ON \ -DWITH_PYTHON=ON \
-DBUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
CORRADE_TEST_COLOR=ON ctest -V
# Verify the setuptools install # Verify the setuptools install
cd src/python cd src/python
python3 setup.py install --root="$TRAVIS_BUILD_DIR/install" --prefix=/usr python3 setup.py install --root="$TRAVIS_BUILD_DIR/install" --prefix=/usr

Write Preview
Loading…
Cancel
Save