Merge a9f25ca into ed1f1c1

fmts/fmt_test.go

@@ -25,13 +25,6 @@ func testfmt(t *testing.T, name string, f *Fmt) {
 		return
 	}
 	defer in.Close()
-	okfile := fmt.Sprintf("testdata/%s.ok", name)
-	ok, err := os.Open(okfile)
-	if err != nil {
-		t.Errorf("no ok test for %q: %v", name, err)
-		return
-	}
-	defer ok.Close()
 	outfile := fmt.Sprintf("testdata/%s.out", name)
 	out, err := os.Create(outfile)
 	if err != nil {
@@ -51,6 +44,13 @@ func testfmt(t *testing.T, name string, f *Fmt) {
 	if err := bufout.Flush(); err != nil {
 		t.Error(err)
 	}
+	okfile := fmt.Sprintf("testdata/%s.ok", name)
+	ok, err := os.Open(okfile)
+	if err != nil {
+		t.Errorf("no ok test for %q: %v", name, err)
+		return
+	}
+	defer ok.Close()
 	b, err := exec.Command("diff", "-u", okfile, outfile).Output()
 	if err != nil {
 		t.Error(err)

fmts/gendoc.go

@@ -26,6 +26,9 @@ func run() error {
 	defer f.Close()
 	w := bufio.NewWriter(f)
 	defer w.Flush()
+
+	fmt.Fprintln(w, firstlines)
+	fmt.Fprintln(w, "")
 	fmt.Fprintln(w, pkgcomment)
 	fmt.Fprintln(w, "//")
 	fmt.Fprintln(w, "// Defined formats:")
@@ -58,6 +61,10 @@ func run() error {
 }
 
 const (
+	firstlines = `// Code generated by 'go generate'
+// source: fmts/gendoc.go
+// DO NOT EDIT!
+// Please run '$ go generate ./...' instead to update this file`
 	pkgcomment = `// Package fmts holds defined errorformats.`
 	pkgline    = `package fmts`
 )