Updating CI scripts

This commit is contained in:
Michael Tryby
2019-03-21 18:34:01 -04:00
parent eb4ae7f670
commit 82055f24a9
2 changed files with 5 additions and 6 deletions

View File

@@ -40,14 +40,14 @@ before_script:
- cd $BUILD_HOME - cd $BUILD_HOME
- cmake -DCMAKE_C_COMPILER=${CC} - cmake -DCMAKE_C_COMPILER=${CC}
-DCMAKE_CXX_COMPILER=${CXX} -DCMAKE_CXX_COMPILER=${CXX}
-DBUILD_TESTS=ON -DBUILD_TESTING=ON
-DBUILD_COVERAGE=ON .. -DBUILD_COVERAGE=ON ..
script: script:
- cmake --build . - cmake --build .
# run unit tests # run unit tests
- cd tests - cd tests
- ctest - ctest test
# run regression tests # run regression tests
- cd $EPANET_HOME - cd $EPANET_HOME
- pip install -r tools/requirements.txt - pip install -r tools/requirements.txt

View File

@@ -55,9 +55,8 @@ before_build:
- mkdir %BUILD_HOME% - mkdir %BUILD_HOME%
- cd %BUILD_HOME% - cd %BUILD_HOME%
- cmake -G "%GENERATOR%" - cmake -G "%GENERATOR%"
-DBUILD_TESTS=ON -DBUILD_TESTING=ON
-DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_ROOT="%BOOST_ROOT%" ..
-DBoost_USE_STATIC_LIBS="ON" ..
# run custom build script # run custom build script
build_script: build_script:
@@ -71,7 +70,7 @@ before_test:
test_script: test_script:
# run unit tests # run unit tests
- cd %BUILD_HOME%\tests - cd %BUILD_HOME%\tests
- ctest -C Release - ctest -C Release RUN_TESTS
# run regression tests # run regression tests
- cd %EPANET_HOME% - cd %EPANET_HOME%
- tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID% - tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%