Commit d2aa7f4f authored by eric pellegrini's avatar eric pellegrini Committed by Remi Perenon
Browse files

refactored the CI windows scripts

parent 2cb2c35f
...@@ -23,6 +23,7 @@ ci:trusty: ...@@ -23,6 +23,7 @@ ci:trusty:
expire_in: 1 day expire_in: 1 day
tags: tags:
- ubuntu16.04 - ubuntu16.04
deploy:trusty: deploy:trusty:
stage: deploy stage: deploy
script: script:
...@@ -60,6 +61,7 @@ ci:osx: ...@@ -60,6 +61,7 @@ ci:osx:
expire_in: 1 day expire_in: 1 day
tags: tags:
- macos10.13 - macos10.13
test:osx: test:osx:
stage: test stage: test
script: script:
...@@ -77,6 +79,7 @@ test:osx: ...@@ -77,6 +79,7 @@ test:osx:
- build:osx - build:osx
tags: tags:
- macos10.13 - macos10.13
deploy:osx: deploy:osx:
stage: deploy stage: deploy
script: script:
...@@ -114,6 +117,7 @@ ci:windows: ...@@ -114,6 +117,7 @@ ci:windows:
expire_in: 1 day expire_in: 1 day
tags: tags:
- windows - windows
deploy:windows: deploy:windows:
stage: deploy stage: deploy
script: script:
......
...@@ -9,6 +9,7 @@ rem Set the path to python executable ...@@ -9,6 +9,7 @@ rem Set the path to python executable
set PYTHON_EXE=%PYTHON_DIR%\\python.exe set PYTHON_EXE=%PYTHON_DIR%\\python.exe
set MDANSE_UNIT_TESTS_DIR=%MDANSE_SOURCE_DIR%\\Tests\\UnitTests set MDANSE_UNIT_TESTS_DIR=%MDANSE_SOURCE_DIR%\\Tests\\UnitTests
<<<<<<< 2cb2c35f95b3c5436e8c7cff1d7ca11b6530dd80
cd "%MDANSE_UNIT_TESTS_DIR%" cd "%MDANSE_UNIT_TESTS_DIR%"
...@@ -27,6 +28,8 @@ cd "%MDANSE_FUNCTIONAL_TESTS_DIR%" ...@@ -27,6 +28,8 @@ cd "%MDANSE_FUNCTIONAL_TESTS_DIR%"
rem Generate the functional test Python files (one for each job) rem Generate the functional test Python files (one for each job)
:: Remove actual Test files (if any) and the test_BuildJobTests.py file :: Remove actual Test files (if any) and the test_BuildJobTests.py file
del Test_*
%1\python.exe BuildJobTests.py
del AllTests* del AllTests*
del Build* del Build*
%1\python.exe -m nose %1\python.exe -m nose
......
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