diff --git a/.testing/Makefile b/.testing/Makefile index 5ce85d4456..1dee0e2100 100644 --- a/.testing/Makefile +++ b/.testing/Makefile @@ -1,6 +1,8 @@ SHELL = bash MPIRUN ?= mpirun +-include config.mk + #--- # Dependencies BASE = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/.. @@ -217,13 +219,13 @@ endif define STAT_RULE $$(BASE)/.testing/%/ocean.stats.$(1): $$(BUILD)/$(2)/MOM6 - if [ $(3) ]; then find build -name *.gcda -exec rm -f '{}' \; ; fi + if [ $(3) ]; then find $$(BUILD) -name *.gcda -exec rm -f '{}' \; ; fi mkdir -p $$(@D)/RESTART echo $(4) > $$(@D)/MOM_override cd $$(@D) && $$(call MPIRUN_CMD,$(5)) -n $(6) $$< 2> debug.out cp $$(@D)/ocean.stats $$@ > $$(@D)/MOM_override - if [ $(3) ]; then bash <(curl -s https://codecov.io/bash) -n $$@; fi + if [ $(3) ]; then cd $$(BASE) && bash <(curl -s https://codecov.io/bash) -n $$@; fi $$(BASE)/.testing/%/chksum_diag.$(1): $$(BASE)/.testing/%/ocean.stats.$(1) cp $$(@D)/chksum_diag $$@ diff --git a/.travis.yml b/.travis.yml index 3b5156c60f..41d9d9b348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,5 +41,7 @@ jobs: REPORT_COVERAGE=true - echo -en 'travis_fold:end:script.1\\r' - echo 'Running tests...' && echo -en 'travis_fold:start:script.2\\r' - - make DO_REGRESSION_TESTS=${TRAVIS_IS_PR} test + - make test \ + DO_REGRESSION_TESTS=${TRAVIS_IS_PR} \ + REPORT_COVERAGE=true - echo -en 'travis_fold:end:script.2\\r'