Browse code

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

Enable DockerTrustSuite for ARM again

Tibor Vass authored on 2016/01/23 01:23:19
Showing 2 changed files
... ...
@@ -155,7 +155,13 @@ ORIG_BUILDFLAGS=( -a -tags "autogen netgo static_build sqlite_omit_load_extensio
155 155
 # see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here
156 156
 BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
157 157
 # Test timeout.
158
-: ${TIMEOUT:=180m}
158
+
159
+if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
160
+	: ${TIMEOUT:=210m}
161
+else
162
+	: ${TIMEOUT:=120m}
163
+fi
164
+
159 165
 TESTFLAGS+=" -test.timeout=${TIMEOUT}"
160 166
 
161 167
 LDFLAGS_STATIC_DOCKER="
... ...
@@ -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
 }