[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / cmd / compile / internal / amd64 / versions_test.go

diff --git a/src/cmd/compile/internal/amd64/versions_test.go b/src/cmd/compile/internal/amd64/versions_test.go
index a21e5f2e6f774f943fbd56c9decd4909ea585679..6c2617d844e75229ef7ca1bc95f97c2e095b007e 100644 (file)
--- a/src/cmd/compile/internal/amd64/versions_test.go
+++ b/src/cmd/compile/internal/amd64/versions_test.go
@@ -10,6 +10,7 @@ import (
        "bufio"
        "debug/elf"
        "debug/macho"
+       "errors"
        "fmt"
        "internal/testenv"
        "io"
@@ -117,9 +118,12 @@ func clobber(t *testing.T, src string, dst *os.File, opcodes map[string]bool) {
                var err error
                disasm, err = cmd.StdoutPipe()
                if err != nil {
-                       t.Skipf("can't run test due to missing objdump: %s", err)
+                       t.Fatal(err)
                }
                if err := cmd.Start(); err != nil {
+                       if errors.Is(err, exec.ErrNotFound) {
+                               t.Skipf("can't run test due to missing objdump: %s", err)
+                       }
                        t.Fatal(err)
                }
                re = regexp.MustCompile(`^\s*([0-9a-f]+):\s*((?:[0-9a-f][0-9a-f] )+)\s*([a-z0-9]+)`)