Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled another non working config (gcc c++98) of python

Browse Source
This commit is contained in:
Jan Möbius
2015-12-15 10:57:48 +01:00
parent e7e18077c4
commit 4cfbfbf21e
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CI/ci-linux.sh
View File

@@ -33,6 +33,7 @@ fi
#===================================== #=====================================
NC='\033[0m' NC='\033[0m'
OUTPUT='\033[0;32m' OUTPUT='\033[0;32m'
WARNING='\033[0;93m'
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
@@ -97,6 +98,7 @@ echo "Running Python unittests Release version "
echo "======================================================================" echo "======================================================================"
echo -e "${NC}" echo -e "${NC}"
if [ "$LANGUAGE" == "C++11" ] || [ "$COMPILER" == "gcc" ] ; then
# Execute Python unittests # Execute Python unittests
cd Python-Unittests cd Python-Unittests
@@ -104,6 +106,14 @@ cd Python-Unittests
python -m unittest discover -v python -m unittest discover -v
cd .. cd ..
else
echo -e "${WARNING}"
echo "WARNING! Python unittests disabled !!"
echo -e "${NC}"
fi
cd .. cd ..
@@ -171,8 +181,16 @@ echo "Running Python unittests Debug version "
echo "======================================================================" echo "======================================================================"
echo -e "${NC}" echo -e "${NC}"
if [ "$LANGUAGE" == "C++11" ] || [ "$COMPILER" == "gcc" ] ; then
# Execute Python unittests # Execute Python unittests
cd Python-Unittests cd Python-Unittests
python -m unittest discover -v python -m unittest discover -v
else
echo -e "${WARNING}"
echo "WARNING! Python unittests disabled !!"
echo -e "${NC}"
fi

7
CI/ci-mac.sh
View File

@@ -25,6 +25,7 @@ fi
#===================================== #=====================================
NC='\033[0m' NC='\033[0m'
OUTPUT='\033[0;32m' OUTPUT='\033[0;32m'
WARNING='\033[0;93m'
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
@@ -102,7 +103,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
cd .. cd ..
else else
echo -e "${WARNING}"
echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!" echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!"
echo -e "${NC}"
fi fi
@@ -182,5 +185,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
cp ../Build/python/openmesh.so . cp ../Build/python/openmesh.so .
python -m unittest discover -v python -m unittest discover -v
else else
echo -e "${WARNING}"
echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!" echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!"
echo -e "${NC}"
fi fi