debian: skip snap-confine unit tests on nocheck #2567
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvo5
reviewed
Jan 6, 2017
| @@ -108,9 +108,10 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) | |||
| # check that only the main trusted account-key is included | |||
There was a problem hiding this comment.
Not strictly related to this PR but I think the lines before this check are slightly confusing. I think we should check there for "testkeys" instead of "nocheck". I.e. write it like:
index 3dfad9a..494cab6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,13 +102,15 @@ override_dh_auto_build:
override_dh_auto_test:
dh_auto_test -- $(GCCGOFLAGS)
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter testkeys,$(DEB_BUILD_OPTIONS)))
# check that only the main trusted account-key is included
[ $$(strings _build/bin/snapd|grep -c -E "public-key-sha3-384: [a-zA-Z0-9_-]{64}") -eq 1 ]
strings _build/bin/snapd|grep -c "^public-key-sha3-384: -CvQKAwRQ5h3Ffn10FILJoEZUXOv6km9FwA80-Rcj-f-6jadQ89VRswHNiEB9Lxk$$"
endif
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# run the snap-confine tests
$(MAKE) -C cmd check
+endif
override_dh_systemd_enable:
# enable auto-import
WDYT?
There was a problem hiding this comment.
FYI: I assume you meant ifneq in the first line.
There was a problem hiding this comment.
My comment got obsolete by telegram discussion(s)
chipaca
approved these changes
Jan 12, 2017
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com