]> Cypherpunks repositories - gostls13.git/commitdiff
syscall: fix unshare test on mips
authorJess Frazelle <me@jessfraz.com>
Fri, 20 May 2016 05:26:01 +0000 (22:26 -0700)
committerIan Lance Taylor <iant@golang.org>
Fri, 20 May 2016 05:52:35 +0000 (05:52 +0000)
Change-Id: Iedce3770a92112802f3a45c7b95ee145ab5b187e
Reviewed-on: https://go-review.googlesource.com/23282
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>

src/syscall/exec_linux_test.go

index ec5be107e049f81eedd76aeb427909d2df49bf10..099756328c9cb4f539d4ca8fba4d3ebc62bdfd95 100644 (file)
@@ -141,7 +141,7 @@ func TestUnshare(t *testing.T) {
                t.Skip("skipping test on Kubernetes-based builders; see Issue 12815")
        }
 
-       cmd := exec.Command("ip", "a")
+       cmd := exec.Command("cat", "/proc/net/dev")
        cmd.SysProcAttr = &syscall.SysProcAttr{
                Unshare: syscall.CLONE_NEWNET,
        }
@@ -152,12 +152,12 @@ func TestUnshare(t *testing.T) {
 
        // Check there is only the local network interface
        sout := strings.TrimSpace(string(out))
-       if !strings.Contains(sout, "lo") {
+       if !strings.Contains(sout, "lo:") {
                t.Fatalf("Expected lo network interface to exist, got %s", sout)
        }
 
        lines := strings.Split(sout, "\n")
-       if len(lines) != 2 {
-               t.Fatalf("Expected 2 lines of output, got %d", len(lines))
+       if len(lines) != 3 {
+               t.Fatalf("Expected 3 lines of output, got %d", len(lines))
        }
 }