Skip to content

Commit

Permalink
Merge pull request #2567 from zyga/nocheck
Browse files Browse the repository at this point in the history
debian: skip snap-confine unit tests on nocheck
  • Loading branch information
zyga committed Jan 12, 2017
2 parents bcac85a + cd31ee9 commit e30aecf
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,16 @@ override_dh_auto_build:

override_dh_auto_test:
dh_auto_test -- $(GCCGOFLAGS)
# a tested default (production) build should have no test keys
ifeq (,$(filter nocheck,$(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
Expand Down

0 comments on commit e30aecf

Please sign in to comment.