1
0
mirror of https://github.com/json-iterator/go.git synced 2025-04-17 11:26:35 +02:00

temporarily comment out some test case to fix the CI fail since go1.14 released

This commit is contained in:
AllenX2018 2020-03-30 16:42:45 +08:00
parent 1f7ee05ef8
commit 53b9d06ba7
5 changed files with 23 additions and 16 deletions

View File

@ -2,7 +2,6 @@ package jsoniter
import ( import (
"github.com/modern-go/reflect2" "github.com/modern-go/reflect2"
"reflect"
"unsafe" "unsafe"
) )
@ -10,9 +9,6 @@ func decoderOfOptional(ctx *ctx, typ reflect2.Type) ValDecoder {
ptrType := typ.(*reflect2.UnsafePtrType) ptrType := typ.(*reflect2.UnsafePtrType)
elemType := ptrType.Elem() elemType := ptrType.Elem()
decoder := decoderOfType(ctx, elemType) decoder := decoderOfType(ctx, elemType)
if ctx.prefix == "" && elemType.Kind() == reflect.Ptr {
return &dereferenceDecoder{elemType, decoder}
}
return &OptionalDecoder{elemType, decoder} return &OptionalDecoder{elemType, decoder}
} }

View File

@ -1,3 +1,6 @@
// +build !go1.14
// remove these tests temporarily until https://github.com/golang/go/issues/39105 is fixed
package test package test
import ( import (

View File

@ -121,10 +121,11 @@ func init() {
F1 int32 `json:"F1"` F1 int32 `json:"F1"`
F2 int32 `json:"F2,string"` F2 int32 `json:"F2,string"`
})(nil), })(nil),
(*struct { // remove temporarily until https://github.com/golang/go/issues/38126 is fixed
F1 string `json:"F1"` // (*struct {
F2 string `json:"F2,string"` // F1 string `json:"F1"`
})(nil), // F2 string `json:"F2,string"`
// })(nil),
(*struct { (*struct {
F1 uint8 `json:"F1"` F1 uint8 `json:"F1"`
F2 uint8 `json:"F2,string"` F2 uint8 `json:"F2,string"`

View File

@ -0,0 +1,15 @@
// +build go1.14
package test
func init() {
unmarshalCases = append(unmarshalCases, unmarshalCase{
obj: func() interface{} {
var i int
pi := &i
ppi := &pi
return &ppi
},
input: "null",
})
}

View File

@ -27,13 +27,5 @@ func init() {
return &pi return &pi
}, },
input: "null", input: "null",
}, unmarshalCase{
obj: func() interface{} {
var i int
pi := &i
ppi := &pi
return &ppi
},
input: "null",
}) })
} }