Update to current version of Go library.

[pf3gnuchains/gcc-fork.git] / libgo / go / asn1 / asn1_test.go

diff --git a/libgo/go/asn1/asn1_test.go b/libgo/go/asn1/asn1_test.go
index b776765..78f5628 100644 (file)
--- a/libgo/go/asn1/asn1_test.go
+++ b/libgo/go/asn1/asn1_test.go
@@ -267,11 +267,6 @@ func TestParseFieldParameters(t *testing.T) {
        }
 }
 
-type unmarshalTest struct {
-       in  []byte
-       out interface{}
-}
-
 type TestObjectIdentifierStruct struct {
        OID ObjectIdentifier
 }
@@ -290,7 +285,10 @@ type TestElementsAfterString struct {
        A, B int
 }
 
-var unmarshalTestData []unmarshalTest = []unmarshalTest{
+var unmarshalTestData = []struct {
+       in  []byte
+       out interface{}
+}{
        {[]byte{0x02, 0x01, 0x42}, newInt(0x42)},
        {[]byte{0x30, 0x08, 0x06, 0x06, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d}, &TestObjectIdentifierStruct{[]int{1, 2, 840, 113549}}},
        {[]byte{0x03, 0x04, 0x06, 0x6e, 0x5d, 0xc0}, &BitString{[]byte{110, 93, 192}, 18}},
@@ -309,9 +307,7 @@ var unmarshalTestData []unmarshalTest = []unmarshalTest{
 
 func TestUnmarshal(t *testing.T) {
        for i, test := range unmarshalTestData {
-               pv := reflect.MakeZero(reflect.NewValue(test.out).Type())
-               zv := reflect.MakeZero(pv.Type().(*reflect.PtrType).Elem())
-               pv.(*reflect.PtrValue).PointTo(zv)
+               pv := reflect.New(reflect.TypeOf(test.out).Elem())
                val := pv.Interface()
                _, err := Unmarshal(test.in, val)
                if err != nil {