libgo: Update to weekly 2011-11-09.

[pf3gnuchains/gcc-fork.git] / libgo / go / html / template / content_test.go

diff --git a/libgo/go/exp/template/html/content_test.go b/libgo/go/html/template/content_test.go
similarity index 98%
rename from libgo/go/exp/template/html/content_test.go
rename to libgo/go/html/template/content_test.go
index 033dee1..c96a521 100644 (file)
--- a/libgo/go/exp/template/html/content_test.go
+++ b/libgo/go/html/template/content_test.go
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package html
+package template
 
 import (
        "bytes"
        "strings"
-       "template"
        "testing"
 )
 
@@ -203,7 +202,7 @@ func TestTypedContent(t *testing.T) {
        }
 
        for _, test := range tests {
-               tmpl := template.Must(Escape(template.Must(template.New("x").Parse(test.input))))
+               tmpl := Must(New("x").Parse(test.input))
                pre := strings.Index(test.input, "{{.}}")
                post := len(test.input) - (pre + 5)
                var b bytes.Buffer