kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm

Browse source 
Enable DockerTrustSuite for ARM again
This commit is contained in:
Tibor Vass 2016-01-22 11:23:19 -05:00
commit cba7ba25f4
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hack/make.sh
View file

@ -155,7 +155,13 @@ ORIG_BUILDFLAGS=( -a -tags "autogen netgo static_build sqlite_omit_load_extensio
# see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here # see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here
BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" ) BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
# Test timeout. # Test timeout.
: ${TIMEOUT:=180m}
if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
: ${TIMEOUT:=210m}
else
: ${TIMEOUT:=120m}
fi
TESTFLAGS+=" -test.timeout=${TIMEOUT}" TESTFLAGS+=" -test.timeout=${TIMEOUT}"
LDFLAGS_STATIC_DOCKER=" LDFLAGS_STATIC_DOCKER="

1
integration-cli/check_test.go
View file

@ -128,7 +128,6 @@ type DockerTrustSuite struct {
} }
func (s *DockerTrustSuite) SetUpTest(c *check.C) { func (s *DockerTrustSuite) SetUpTest(c *check.C) {
testRequires(c, NotArm)
s.reg = setupRegistry(c, false) s.reg = setupRegistry(c, false)
s.not = setupNotary(c) s.not = setupNotary(c)
} }