Apply changes to mac version as well
This commit is contained in:
117
CI/ci-mac.sh
117
CI/ci-mac.sh
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#Exit on any error
|
#Exit on any error
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
LANGUAGE=$1
|
LANGUAGE=$1
|
||||||
|
|
||||||
@@ -12,23 +12,28 @@ OPTIONS=""
|
|||||||
|
|
||||||
if [ "$LANGUAGE" == "C++98" ]; then
|
if [ "$LANGUAGE" == "C++98" ]; then
|
||||||
echo "Building with C++98";
|
echo "Building with C++98";
|
||||||
|
BUILDPATH="$BUILDPATH-cpp98"
|
||||||
elif [ "$LANGUAGE" == "C++11" ]; then
|
elif [ "$LANGUAGE" == "C++11" ]; then
|
||||||
echo "Building with C++11";
|
echo "Building with C++11";
|
||||||
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
|
OPTIONS="$OPTIONS -DCMAKE_CXX_FLAGS='-std=c++11' "
|
||||||
|
BUILDPATH="$BUILDPATH-cpp11"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Building Release version with vectorchecks enabled"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
|
||||||
|
if [ ! -d build-release-$BUILDPATH-Vector-Checks ]; then
|
||||||
|
mkdir build-release-$BUILDPATH-Vector-Checks
|
||||||
fi
|
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 ../
|
||||||
# Build release version
|
|
||||||
#########################################
|
|
||||||
|
|
||||||
if [ ! -d build-release ]; then
|
|
||||||
mkdir build-release
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd build-release
|
|
||||||
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON $OPTIONS ../
|
|
||||||
|
|
||||||
#build it
|
#build it
|
||||||
make
|
make
|
||||||
@@ -36,16 +41,45 @@ make
|
|||||||
#build the unit tests
|
#build the unit tests
|
||||||
make unittests
|
make unittests
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Running unittests Release version with vectorchecks enabled"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
|
||||||
#########################################
|
|
||||||
# Run Release Unittests
|
|
||||||
#########################################
|
|
||||||
cd Unittests
|
cd Unittests
|
||||||
|
|
||||||
#execute tests
|
#execute tests
|
||||||
./unittests --gtest_color=yes --gtest_output=xml
|
./unittests --gtest_color=yes --gtest_output=xml
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Building Release version with vectorchecks disabled for python tests"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Running Python unittests Release version "
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
|
||||||
# Execute Python unittests
|
# Execute Python unittests
|
||||||
cd Python-Unittests
|
cd Python-Unittests
|
||||||
|
|
||||||
@@ -57,17 +91,21 @@ cd ..
|
|||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
|
||||||
#########################################
|
|
||||||
# Build Debug version and Unittests
|
|
||||||
#########################################
|
|
||||||
|
|
||||||
if [ ! -d build-debug ]; then
|
echo ""
|
||||||
mkdir build-debug
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Building Debug version with vectorchecks enabled"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
|
||||||
|
if [ ! -d build-debug-$BUILDPATH-Vector-Checks ]; then
|
||||||
|
mkdir build-debug-$BUILDPATH-Vector-Checks
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd build-debug
|
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=ON $OPTIONS ../
|
cmake -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DSTL_VECTOR_CHECKS=ON -DOPENMESH_BUILD_PYTHON_UNIT_TESTS=OFF $OPTIONS ../
|
||||||
|
|
||||||
#build it
|
#build it
|
||||||
make
|
make
|
||||||
@@ -75,17 +113,44 @@ make
|
|||||||
#build the unit tests
|
#build the unit tests
|
||||||
make unittests
|
make unittests
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Running unittests Debug version with vectorchecks enabled"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
#########################################
|
|
||||||
# Run Debug Unittests
|
|
||||||
#########################################
|
|
||||||
|
|
||||||
cd Unittests
|
cd Unittests
|
||||||
|
|
||||||
# Run the unittests
|
#execute tests
|
||||||
./unittests --gtest_color=yes --gtest_output=xml
|
./unittests --gtest_color=yes --gtest_output=xml
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Building Debug version with vectorchecks disabled for python tests"
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
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 ""
|
||||||
|
echo ""
|
||||||
|
echo "======================================================================"
|
||||||
|
echo "Running Python unittests Debug version "
|
||||||
|
echo "====================================================================== \n"
|
||||||
|
|
||||||
|
|
||||||
# Execute Python unittests
|
# Execute Python unittests
|
||||||
cd Python-Unittests
|
cd Python-Unittests
|
||||||
|
|||||||
Reference in New Issue
Block a user