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

tiborvass · tiborvass · commit cba7ba25f435 · 2016-01-22T11:23:19.000-05:00
Enable DockerTrustSuite for ARM again
diff --git a/hack/make.sh b/hack/make.sh
@@ -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
 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="
diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go
@@ -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)
 }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,6 @@ type DockerTrustSuite struct {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`func (s DockerTrustSuite) SetUpTest(c check.C) {`
`131`		`- testRequires(c, NotArm)`
`132`	`131`	`s.reg = setupRegistry(c, false)`
`133`	`132`	`s.not = setupNotary(c)`
`134`	`133`	`}`