Commit 09405933 authored by Remi Perenon's avatar Remi Perenon
Browse files

Modification of BuildServer scripts

parent f99a3a48
Pipeline #3422 canceled with stages
in 18 minutes and 35 seconds
......@@ -9,16 +9,17 @@ cd Tests/UnitTests
if [ $? -ne 0 ]; then
status = $?
echo -e "$ROUGE""One or several unit tests failed"
exit status
exit $status
fi
cd ../..
cd Tests/FunctionalTests/Jobs
rm -rf Test_*
/Library/Frameworks/Python.framework/Versions/2.7/bin/python BuildJobTests.py
/Library/Frameworks/Python.framework/Versions/2.7/bin/nosetests --verbosity=3 --exe -P .
/Library/Frameworks/Python.framework/Versions/2.7/bin/nosetests --verbosity=3 --exe Test_*.py
if [ $? -ne 0 ]; then
status=$?
echo -e "$ROUGE""One or several functional tests failed"
exit status
exit $status
fi
cd ../../..
......@@ -21,7 +21,7 @@ cd ../..
cd Tests/FunctionalTests/Jobs
rm -rf Test_*
python BuildJobTests.py
nosetests --verbosity=3 --exe -P .
nosetests --verbosity=3 --exe Test_*.py
if [ $? -ne 0 ]; then
status=$?
echo -e "$ROUGE""One or several functional tests failed"
......
......@@ -4,6 +4,8 @@
# CONFIGURATION
#############################
echo $PATH
if [ ! $1 ]; then
BUILD_TARGET="win-amd64"
else
......@@ -213,5 +215,5 @@ cmd /V:ON /E:ON /C "setup_and_build.bat" "${CI_PROJECT_DIR_WIN}" "${TARGET_DIR}"
if [ $? -ne 0 ]; then
status=$?
echo "Failed to build MDANSE"
exit status
exit $status
fi
......@@ -11,8 +11,9 @@ cd %testsPath%
set testsPath=%2\Tests\FunctionalTests\Jobs
cd %testsPath%
del Test_*
%1\python.exe BuildJobTests.py
%1\python.exe %1\Scripts\nosetests --verbosity=3 -P %testsPath%
%1\python.exe %1\Scripts\nosetests --verbosity=3 %testsPath%\Test_*.py
exit %errorlevel%
\ No newline at end of file
......@@ -20,6 +20,6 @@ cmd /V:ON /E:ON /C "run_tests.bat" "${TARGET_DIR}" "${CI_PROJECT_DIR_WIN}"
if [ $? -ne 0 ]; then
status=$?
echo "One or several unit tests failed"
exit status
exit $status
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment