Skip to content
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

Jump to bottom

Make CCPP SUITES argument optional #62

Merged
merged 1 commit into from
May 12, 2020
Merged

Make CCPP SUITES argument optional #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 4 deletions src/incmake/component_CCPP.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ endif
# Process make options for CCPP build
ifneq (,$(findstring SUITES=,$(FV3_MAKEOPT)))
# Extract name of suite definition files using sed:
# - remove everything leading up to the name of the suite definition file
# - remove everything following the name of the suite definition file
# - remove everything leading up to the names of the suite definition files
# - remove everything following the names of the suite definition files
SUITES = $(shell echo $(FV3_MAKEOPT) | sed 's/.* SUITES=//' | sed 's/ .*//')
override CCPP_CONFOPT += --suites=$(SUITES)
else
$(error Required suites argument missing: SUITES=xyz,abc,... (where suite xyz corresponds to file suite_xyz.xml))
endif

# Make sure the expected directories exist and are non-empty:
Expand Down