Enable DockerTrustSuite for ARM again

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
This commit is contained in:
Stefan Scherer 2016-01-20 07:30:54 +01:00
parent d45643a865
commit acb42c5fab
2 changed files with 7 additions and 2 deletions

View File

@ -145,7 +145,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
BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
# Test timeout.
: ${TIMEOUT:=180m}
if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
: ${TIMEOUT:=210m}
else
: ${TIMEOUT:=120m}
fi
TESTFLAGS+=" -test.timeout=${TIMEOUT}"
LDFLAGS_STATIC_DOCKER="

View File

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