hw-health-charm

Merge charm-hw-health:fix-innocuous-make-rule into charm-hw-health:master

  1. Git
  2. lp:charm-hw-health
  3. fix-innocuous-make-rule
  4. Merge into master
Proposed by Facundo Ciccioli
Status: Merged
Merged at revision: b1caca24b35378caf088850d713f9623956273d6
Proposed branch: charm-hw-health:fix-innocuous-make-rule
Merge into: charm-hw-health:master
Diff against target: 13 lines (+1/-1)
1 file modified
Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Paul Goins Approve
Zachary Zehring (community) Approve
Review via email: mp+391054@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Zachary Zehring (zzehring) wrote :

LGTM +1

review: Approve
Revision history for this message
Paul Goins (vultaire) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 279ba3d..6cd2381 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -77,7 +77,7 @@ test: lint proof unittests functional
6 @echo "Tests completed for charm ${CHARM_NAME}."
7
8 resource_check:
9-ifeq (${PROJECTPATH}tools.zip,)
10+ifeq ("$(wildcard $(PROJECTPATH)/tools.zip)","")
11 $(error ERROR: You must save the tools resource in ${PROJECTPATH}tools.zip \
12 before running functional tests. \
13 Check the README for instructions on how to do so.)

Subscribers

No one subscribed via source and target branches