From 0593a1cebc3b96b0f43d3f0bff4c7bab996909e5 Mon Sep 17 00:00:00 2001 From: Alessandro Arzilli Date: Wed, 20 Jan 2021 18:40:03 +0100 Subject: [PATCH] cmd/dlv/tests: fix TestGeneratedDoc on Windows (#2314) Change TestGeneratedDoc to ignore differences in line terminators. --- cmd/dlv/dlv_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go index e5e58b7f..8a9874a6 100644 --- a/cmd/dlv/dlv_test.go +++ b/cmd/dlv/dlv_test.go @@ -329,12 +329,17 @@ func TestRedirect(t *testing.T) { func checkAutogenDoc(t *testing.T, filename, gencommand string, generated []byte) { saved := slurpFile(t, filepath.Join(projectRoot(), filename)) + saved = bytes.ReplaceAll(saved, []byte("\r\n"), []byte{'\n'}) + generated = bytes.ReplaceAll(generated, []byte("\r\n"), []byte{'\n'}) + if len(saved) != len(generated) { + t.Logf("generated %q saved %q\n", generated, saved) t.Fatalf("%s: needs to be regenerated; run %s", filename, gencommand) } for i := range saved { if saved[i] != generated[i] { + t.Logf("generated %q saved %q\n", generated, saved) t.Fatalf("%s: needs to be regenerated; run %s", filename, gencommand) } }