Update to current version of Go library.

[pf3gnuchains/gcc-fork.git] / libgo / go / xml / read_test.go

diff --git a/libgo/go/xml/read_test.go b/libgo/go/xml/read_test.go
index a6b9a8e..d4ae370 100644 (file)
--- a/libgo/go/xml/read_test.go
+++ b/libgo/go/xml/read_test.go
@@ -288,9 +288,7 @@ var pathTests = []interface{}{
 
 func TestUnmarshalPaths(t *testing.T) {
        for _, pt := range pathTests {
-               p := reflect.MakeZero(reflect.NewValue(pt).Type()).(*reflect.PtrValue)
-               p.PointTo(reflect.MakeZero(p.Type().(*reflect.PtrType).Elem()))
-               v := p.Interface()
+               v := reflect.New(reflect.TypeOf(pt).Elem()).Interface()
                if err := Unmarshal(StringReader(pathTestString), v); err != nil {
                        t.Fatalf("Unmarshal: %s", err)
                }
@@ -315,8 +313,8 @@ type BadPathTestB struct {
 var badPathTests = []struct {
        v, e interface{}
 }{
-       {&BadPathTestA{}, &TagPathError{reflect.Typeof(BadPathTestA{}), "First", "items>item1", "Second", "items>"}},
-       {&BadPathTestB{}, &TagPathError{reflect.Typeof(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
+       {&BadPathTestA{}, &TagPathError{reflect.TypeOf(BadPathTestA{}), "First", "items>item1", "Second", "items>"}},
+       {&BadPathTestB{}, &TagPathError{reflect.TypeOf(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
 }
 
 func TestUnmarshalBadPaths(t *testing.T) {