Skipping two tests when running with GCCGO (CI)

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
This commit is contained in:
Srini Brahmaroutu 2015-10-10 04:35:09 +00:00
Родитель 10430fd334
Коммит dc813c7d13
3 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -58,6 +58,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, NativeExecDriver)
testRequires(c, oomControl)
testRequires(c, NotGCCGO)
errChan := make(chan error)
go func() {
@ -106,6 +107,7 @@ func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, NativeExecDriver)
testRequires(c, oomControl)
testRequires(c, NotGCCGO)
errChan := make(chan error)
go func() {

Просмотреть файл

@ -3138,7 +3138,7 @@ func (s *DockerSuite) TestAppArmorDeniesPtrace(c *check.C) {
// Run through 'sh' so we are NOT pid 1. Pid 1 may be able to trace
// itself, but pid>1 should not be able to trace pid1.
_, exitCode, _ := dockerCmdWithError("run", "busybox", "sh", "-c", "readlink /proc/1/ns/net")
_, exitCode, _ := dockerCmdWithError("run", "busybox", "sh", "-c", "sh -c readlink /proc/1/ns/net")
if exitCode == 0 {
c.Fatal("ptrace was not successfully restricted by AppArmor")
}

Просмотреть файл

@ -141,10 +141,10 @@ var (
NotGCCGO = testRequirement{
func() bool {
out, err := exec.Command("go", "version").Output()
if err != nil && strings.Contains(string(out), "gccgo") {
return true
if err == nil && strings.Contains(string(out), "gccgo") {
return false
}
return false
return true
},
"Test requires native Golang compiler instead of GCCGO",
}