From abeac0912a037ac557861e6522204627585d6517 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 8 Jun 2018 10:14:29 +0200 Subject: [PATCH] cmd/cover: fix TestCoverHTML on Plan 9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit CL 116975 added TestCoverHTML. However, this test is failing on Plan 9, because the GNU diff tool is called "ape/diff" instead of "diff" on Plan 9. This change replaces the "diff" command by the "ape/diff" command on Plan 9. Fixes #25795. Change-Id: I15b49868cd09f3f977aa13fffdfc430c882bf757 Reviewed-on: https://go-review.googlesource.com/117415 Run-TryBot: David du Colombier <0intro@gmail.com> Reviewed-by: Daniel Martí Reviewed-by: Alex Brainman TryBot-Result: Gobot Gobot --- src/cmd/cover/cover_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cmd/cover/cover_test.go b/src/cmd/cover/cover_test.go index 8462b2d015..ec80f94e59 100644 --- a/src/cmd/cover/cover_test.go +++ b/src/cmd/cover/cover_test.go @@ -310,8 +310,12 @@ func TestCoverHTML(t *testing.T) { if err := ioutil.WriteFile(htmlHTML, out.Bytes(), 0644); err != nil { t.Fatal(err) } + diff := "diff" + if runtime.GOOS == "plan9" { + diff = "/bin/ape/diff" + } // diff -uw testdata/html/html.html testdata/html/html.golden - cmd = exec.Command("diff", "-u", "-w", htmlHTML, htmlGolden) + cmd = exec.Command(diff, "-u", "-w", htmlHTML, htmlGolden) run(cmd, t) } -- 2.50.0