From 82055f24a9ec6b6088c53188cdc89cee0bf5f783 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Thu, 21 Mar 2019 18:34:01 -0400 Subject: [PATCH] Updating CI scripts --- .travis.yml | 4 ++-- appveyor.yml | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc37c27..5ab4945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,14 +40,14 @@ before_script: - cd $BUILD_HOME - cmake -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} - -DBUILD_TESTS=ON + -DBUILD_TESTING=ON -DBUILD_COVERAGE=ON .. script: - cmake --build . # run unit tests - cd tests - - ctest + - ctest test # run regression tests - cd $EPANET_HOME - pip install -r tools/requirements.txt diff --git a/appveyor.yml b/appveyor.yml index c02546e..606f9c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,9 +55,8 @@ before_build: - mkdir %BUILD_HOME% - cd %BUILD_HOME% - cmake -G "%GENERATOR%" - -DBUILD_TESTS=ON - -DBOOST_ROOT="%BOOST_ROOT%" - -DBoost_USE_STATIC_LIBS="ON" .. + -DBUILD_TESTING=ON + -DBOOST_ROOT="%BOOST_ROOT%" .. # run custom build script build_script: @@ -71,7 +70,7 @@ before_test: test_script: # run unit tests - cd %BUILD_HOME%\tests - - ctest -C Release + - ctest -C Release RUN_TESTS # run regression tests - cd %EPANET_HOME% - tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%