Skip to content

Travis: config.mk user config; enable coverage #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adcroft merged 3 commits into from
Aug 30, 2019
Merged

Travis: config.mk user config; enable coverage #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90b8228
Travis: config.mk user config; enable coverage
marshallward Aug 29, 2019
6bd9459
Modify make test rule
marshallward Aug 29, 2019
d496ee7
Travis: coverage path fixes
marshallward Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .testing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
SHELL = bash
MPIRUN ?= mpirun

-include config.mk

#---
# Dependencies
BASE = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/..
Expand Down Expand Up @@ -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 $$@
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'