diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh index f7632198..84283cae 100755 --- a/CI/ci-linux.sh +++ b/CI/ci-linux.sh @@ -76,7 +76,7 @@ fi cd build-release-$BUILDPATH-Vector-Checks -cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_BINDINGS=OFF $OPTIONS ../ +cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ #build it make $MAKE_OPTIONS @@ -99,51 +99,6 @@ cd Unittests cd .. cd .. -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Building Release version with vectorchecks disabled for python tests" -echo "======================================================================" -echo -e "${NC}" - -if [ ! -d build-release-$BUILDPATH ]; then - mkdir build-release-$BUILDPATH -fi - -cd build-release-$BUILDPATH - -cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF $OPTIONS ../ - -#build it -make $MAKE_OPTIONS - -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Running Python unittests Release version " -echo "======================================================================" -echo -e "${NC}" - -if [ "$LANGUAGE" == "C++11" ] || [ "$COMPILER" == "gcc" ] ; then - - # Execute Python unittests - cd Python-Unittests - - python -m unittest discover -v - - cd .. - -else - echo -e "${WARNING}" - echo "WARNING! Python unittests disabled !!" - echo -e "${NC}" -fi - - -cd .. - - - echo -e "${OUTPUT}" echo "" echo "======================================================================" @@ -158,7 +113,7 @@ fi cd build-debug-$BUILDPATH-Vector-Checks -cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_BINDINGS=OFF $OPTIONS ../ +cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ #build it make $MAKE_OPTIONS @@ -181,42 +136,3 @@ cd Unittests cd .. cd .. - -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Building Debug version with vectorchecks disabled for python tests" -echo "======================================================================" -echo -e "${NC}" - -if [ ! -d build-debug-$BUILDPATH ]; then - mkdir build-debug-$BUILDPATH -fi - -cd build-debug-$BUILDPATH - -cmake -DCMAKE_BUILD_TYPE=DEBUG -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF $OPTIONS ../ - -#build it -make $MAKE_OPTIONS - -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Running Python unittests Debug version " -echo "======================================================================" -echo -e "${NC}" - -if [ "$LANGUAGE" == "C++11" ] || [ "$COMPILER" == "gcc" ] ; then - - # Execute Python unittests - cd Python-Unittests - - python -m unittest discover -v -else - - echo -e "${WARNING}" - echo "WARNING! Python unittests disabled !!" - echo -e "${NC}" - -fi diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh index 9dd14577..2aeae642 100755 --- a/CI/ci-mac.sh +++ b/CI/ci-mac.sh @@ -58,7 +58,7 @@ fi cd build-release-$BUILDPATH-Vector-Checks -cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=OFF $OPTIONS ../ +cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ #build it make @@ -81,53 +81,6 @@ cd Unittests cd .. cd .. -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Building Release version with vectorchecks disabled for python tests" -echo "======================================================================" -echo -e "${NC}" - -if [ ! -d build-release-$BUILDPATH ]; then - mkdir build-release-$BUILDPATH -fi - -cd build-release-$BUILDPATH - -cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF -DCPACK_BINARY_DRAGNDROP=ON $OPTIONS ../ - -#build it -make - -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Running Python unittests Release version " -echo "======================================================================" -echo -e "${NC}" - - -if [ "$LANGUAGE" == "C++11" ]; then - - # Execute Python unittests - cd Python-Unittests - - rm -f openmesh.so - cp ../Build/python/openmesh.so . - python -m unittest discover -v - - cd .. - -else - echo -e "${WARNING}" - echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!" - echo -e "${NC}" -fi - -cd .. - - - echo -e "${OUTPUT}" echo "" echo "======================================================================" @@ -142,7 +95,7 @@ fi cd build-debug-$BUILDPATH-Vector-Checks -cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=OFF $OPTIONS ../ +cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON $OPTIONS ../ #build it make @@ -166,52 +119,6 @@ cd Unittests cd .. cd .. -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Building Debug version with vectorchecks disabled for python tests" -echo "======================================================================" -echo -e "${NC}" - -if [ ! -d build-debug-$BUILDPATH ]; then - mkdir build-debug-$BUILDPATH -fi - -cd build-debug-$BUILDPATH - -cmake -DCMAKE_BUILD_TYPE=DEBUG -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON -DBUILD_APPS=OFF $OPTIONS ../ - -#build it -make - -echo -e "${OUTPUT}" -echo "" -echo "======================================================================" -echo "Running Python unittests Debug version " -echo "======================================================================" -echo -e "${NC}" - -if [ "$LANGUAGE" == "C++11" ]; then - - # Execute Python unittests - cd Python-Unittests - - rm -f openmesh.so - cp ../Build/python/openmesh.so . - python -m unittest discover -v - - cd .. - -else - - echo -e "${WARNING}" - echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!" - echo -e "${NC}" - -fi - -cd .. - echo -e "${OUTPUT}" echo "" echo "======================================================================"