Merge tag 'upstream/1.1_hg20130304' into debian-sid

Upstream version 1.1~hg20130304

1 files changed, 0 insertions, 39 deletions

diff --git a/src/cmd/fix/htmlerr_test.go b/src/cmd/fix/htmlerr_test.go
deleted file mode 100644
index 043abc42a..000000000
--- a/src/cmd/fix/htmlerr_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-func init() {
-	addTestCases(htmlerrTests, htmlerr)
-}
-
-var htmlerrTests = []testCase{
-	{
-		Name: "htmlerr.0",
-		In: `package main
-
-import (
-	"html"
-)
-
-func f() {
-	e := errors.New("")
-	t := html.NewTokenizer(r)
-	_, _ = e.Error(), t.Error()
-}
-`,
-		Out: `package main
-
-import (
-	"html"
-)
-
-func f() {
-	e := errors.New("")
-	t := html.NewTokenizer(r)
-	_, _ = e.Error(), t.Err()
-}
-`,
-	},
-}