diff --git a/.travis.yml b/.travis.yml index 9da7e54..7daa659 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ script: # run regression tests - cd $EPANET_HOME - pip install -r tools/requirements.txt - - tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT - - tools/run-nrtest.sh -c -t $TEST_HOME -v $TRAVIS_COMMIT + - tools/before-test.sh $REF_BUILD_ID $SUT_BUILD_ID $TRAVIS_COMMIT + - tools/run-nrtest.sh -c -r $REF_BUILD_ID -s $SUT_BUILD_ID after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/tools/run-nrtest.sh b/tools/run-nrtest.sh index 077dd24..cefeac6 100755 --- a/tools/run-nrtest.sh +++ b/tools/run-nrtest.sh @@ -69,7 +69,7 @@ print_usage() { # Default option values compare='true' -ref_build_id= +ref_build_id='unknown' sut_build_id='local' test_path='nrtestsuite' @@ -87,7 +87,7 @@ shift $(($OPTIND - 1)) # determine ref_build_id from manifest file -if [ -z $ref_build_id ]; then +if [[ $ref_build_id == 'unknown' ]] && [[ $compare == 'true' ]]; then description=(`cat ${test_path}/manifest.json | jq '.Application.description | splits(" ")'`) ref_build_id=${description[1]//\"/} fi