From ca7599f41d131be0f9552284f0247b852f8f6f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 30 Nov 2015 13:24:12 +0100 Subject: [PATCH] Branch with enabled unittests for python --- CI/ci-linux.sh | 13 ++++++++++++- CI/ci-mac.sh | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh index 3378607c..508c4a76 100755 --- a/CI/ci-linux.sh +++ b/CI/ci-linux.sh @@ -58,7 +58,7 @@ cd .. # Execute Python unittests cd Python-Unittests -#python -m unittest discover -v +python -m unittest discover -v cd .. cd .. @@ -76,6 +76,9 @@ cd build-debug-$BUILDPATH cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON $OPTIONS ../ +#build it +make + #build the unit tests make unittests @@ -89,4 +92,12 @@ cd Unittests # Run the unittests ./unittests --gtest_color=yes --gtest_output=xml +cd .. + +# Execute Python unittests +cd Python-Unittests +python -m unittest discover -v + +cd .. +cd .. diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index 0ee6ada2..863d7a67 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -51,7 +51,7 @@ cd Python-Unittests rm -f openmesh.so cp ../Build/python/openmesh.so . -#python -m unittest discover -v +python -m unittest discover -v cd .. cd .. @@ -92,4 +92,4 @@ cd Python-Unittests rm -f openmesh.so cp ../Build/python/openmesh.so . -#python -m unittest discover -v +python -m unittest discover -v