Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
4cfbfbf2
Commit
4cfbfbf2
authored
Dec 15, 2015
by
Jan Möbius
Browse files
Disabled another non working config (gcc c++98) of python
parent
e7e18077
Changes
2
Hide whitespace changes
Inline
Side-by-side
CI/ci-linux.sh
View file @
4cfbfbf2
...
...
@@ -33,6 +33,7 @@ fi
#=====================================
NC
=
'\033[0m'
OUTPUT
=
'\033[0;32m'
WARNING
=
'\033[0;93m'
echo
-e
"
${
OUTPUT
}
"
...
...
@@ -97,13 +98,22 @@ echo "Running Python unittests Release version "
echo
"======================================================================"
echo
-e
"
${
NC
}
"
if
[
"
$LANGUAGE
"
==
"C++11"
]
||
[
"
$COMPILER
"
==
"gcc"
]
;
then
# Execute Python unittests
cd
Python-Unittests
# 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
python
-m
unittest discover
-v
cd
..
cd
..
...
...
@@ -171,8 +181,16 @@ echo "Running Python unittests Debug version "
echo
"======================================================================"
echo
-e
"
${
NC
}
"
if
[
"
$LANGUAGE
"
==
"C++11"
]
||
[
"
$COMPILER
"
==
"gcc"
]
;
then
# Execute Python unittests
cd
Python-Unittests
# Execute P
ython unittest
s
cd
Python-Unittests
p
ython
-m
unittest
discover
-v
else
python
-m
unittest discover
-v
echo
-e
"
${
WARNING
}
"
echo
"WARNING! Python unittests disabled !!"
echo
-e
"
${
NC
}
"
fi
CI/ci-mac.sh
View file @
4cfbfbf2
...
...
@@ -25,6 +25,7 @@ fi
#=====================================
NC
=
'\033[0m'
OUTPUT
=
'\033[0;32m'
WARNING
=
'\033[0;93m'
echo
-e
"
${
OUTPUT
}
"
...
...
@@ -102,7 +103,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
cd
..
else
echo
-e
"
${
WARNING
}
"
echo
"WARNING! Python unittests disabled for clang on Mac with c++98 !!"
echo
-e
"
${
NC
}
"
fi
...
...
@@ -182,5 +185,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
cp
../Build/python/openmesh.so
.
python
-m
unittest discover
-v
else
echo
-e
"
${
WARNING
}
"
echo
"WARNING! Python unittests disabled for clang on Mac with c++98 !!"
echo
-e
"
${
NC
}
"
fi
Jan Möbius
@moebius
mentioned in commit
6220b07b
·
Dec 15, 2015
mentioned in commit
6220b07b
mentioned in commit 6220b07b144e57219f0bf5a932bdbb23bdeb818b
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment