]> Cypherpunks repositories - gostls13.git/commitdiff
all: fix t.Skipf formats
authorRuss Cox <rsc@golang.org>
Wed, 13 Dec 2017 19:57:44 +0000 (14:57 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 13 Dec 2017 21:31:45 +0000 (21:31 +0000)
Found by upcoming cmd/vet change.

Change-Id: I7a8264a304b2a4f26f3bd418c1b28cc849889c9b
Reviewed-on: https://go-review.googlesource.com/83835
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/cmd/go/go_test.go
src/cmd/vendor/golang.org/x/arch/arm64/arm64asm/objdumpext_test.go
src/runtime/crash_cgo_test.go

index 643b3b9506ba25b7ad4c5d66d7afb080ece14e6a..76e3e8423213aa5bf5f2f24c34503c3665096cf7 100644 (file)
@@ -224,7 +224,7 @@ func testgo(t *testing.T) *testgoData {
        testenv.MustHaveGoBuild(t)
 
        if skipExternal {
-               t.Skip("skipping external tests on %s/%s", runtime.GOOS, runtime.GOARCH)
+               t.Skipf("skipping external tests on %s/%s", runtime.GOOS, runtime.GOARCH)
        }
 
        return &testgoData{t: t}
@@ -2284,7 +2284,7 @@ func TestSymlinkWarning(t *testing.T) {
        tg.tempDir("yy/zz")
        tg.tempFile("yy/zz/zz.go", "package zz\n")
        if err := os.Symlink(tg.path("yy"), tg.path("src/example/xx/yy")); err != nil {
-               t.Skip("symlink failed: %v", err)
+               t.Skipf("symlink failed: %v", err)
        }
        tg.run("list", "example/xx/z...")
        tg.grepStdoutNot(".", "list should not have matched anything")
index 8c6ebfb2c379b91844b2e289e6221b84fc6702a1..d3a34809e6adbb39e625152e2b3cd018c78ac0e8 100644 (file)
@@ -35,7 +35,7 @@ func testObjdumpArch(t *testing.T, generate func(func([]byte)), arch Mode) {
 func checkObjdumpAarch64(t *testing.T) {
        out, err := exec.Command(objdumpPath, "-i").Output()
        if err != nil {
-               t.Skip("cannot run objdump: %v\n%s", err, out)
+               t.Skipf("cannot run objdump: %v\n%s", err, out)
        }
        if !strings.Contains(string(out), "aarch64") {
                t.Skip("objdump does not have aarch64 support")
index 50b634dda4528b325651d88e404c9b9b444280e7..8993a75ad3fb1080d6d0459fc1d6b77692a43647 100644 (file)
@@ -472,7 +472,7 @@ func TestWindowsStackMemoryCgo(t *testing.T) {
 func TestSigStackSwapping(t *testing.T) {
        switch runtime.GOOS {
        case "plan9", "windows":
-               t.Skip("no sigaltstack on %s", runtime.GOOS)
+               t.Skipf("no sigaltstack on %s", runtime.GOOS)
        }
        t.Parallel()
        got := runTestProg(t, "testprogcgo", "SigStack")