1. docker
  2. Commit 9c1566a1dfa3eccd12e09a3e2cbda60503600d44
Browse code

Add NoArm64 testRequires and skip Schema1RegistrySuite on arm64

schema1 manifests is not working on ARM64, we should skip integration-cli
tests for schema1 manifests on ARM64.

Signed-off-by: Lei Jitang <leijitang@huawei.com>

Lei Jitang authored on 2016/07/04 19:09:46
Showing 2 changed files
integration-cli/check_test.go
History View file @ 9c1566a
... ... 
@@ -80,7 +80,7 @@ type DockerSchema1RegistrySuite struct {
80 80 
 }
81 81
82 82 
 func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {
83 
-	testRequires(c, DaemonIsLinux, RegistryHosting)
83 
+	testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64)
84 84 
 	s.reg = setupRegistry(c, true, "", "")
85 85 
 	s.d = NewDaemon(c)
86 86 
 }
integration-cli/requirements.go
History View file @ 9c1566a
... ... 
@@ -42,6 +42,10 @@ var (
42 42 
 		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
43 43 
 		"Test requires a daemon not running on ARM",
44 44 
 	}
45 
+	NotArm64 = testRequirement{
46 
+		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm64" },
47 
+		"Test requires a daemon not running on arm64",
48 
+	}
45 49 
 	NotPpc64le = testRequirement{
46 50 
 		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
47 51 
 		"Test requires a daemon not running on ppc64le",