From d646e21ff436cd2a40b23314436cd53f21ae9500 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 5 Jan 2020 12:44:49 +0100 Subject: prog: fix tests for string enforcement String value enforcement broke a number of tests where we use different values. Be more string as to what string values we use in tests. Required to add tmpfs descriptions to test syz_mount_image. Also special-casing AF_ALG algorithms as these are auto-generated. --- sys/test/gen/64.go | 6 +++--- sys/test/test.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/test') diff --git a/sys/test/gen/64.go b/sys/test/gen/64.go index 681b7fee4..07ea5580e 100644 --- a/sys/test/gen/64.go +++ b/sys/test/gen/64.go @@ -193,8 +193,8 @@ var structDescs_64 = []*KeyedStruct{ &LenType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "offsetof", FldName: "o7", TypeSize: 4}}, BitSize: 8, Offset: true, Path: []string{"f7"}}, }}}, {Key: StructKey{Name: "serialize0_struct"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "serialize0_struct", TypeSize: 15}, Fields: []Type{ - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "a", TypeSize: 10}, Kind: 2, SubKind: "serialize_strings", Values: []string{"aaa\x00\x00\x00\x00\x00\x00\x00", "bbb\x00\x00\x00\x00\x00\x00\x00"}}, - &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "b", TypeSize: 5}, Kind: 2, SubKind: "serialize_strings", Values: []string{"aaa\x00\x00", "bbb\x00\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "a", TypeSize: 10}, Kind: 2, SubKind: "serialize_strings", Values: []string{"aaa\x00\x00\x00\x00\x00\x00\x00", "bbb\x00\x00\x00\x00\x00\x00\x00", "hash\x00\x00\x00\x00\x00\x00", "HI\x00\x00\x00\x00\x00\x00\x00\x00"}}, + &BufferType{TypeCommon: TypeCommon{TypeName: "string", FldName: "b", TypeSize: 5}, Kind: 2, SubKind: "serialize_strings", Values: []string{"aaa\x00\x00", "bbb\x00\x00", "hash\x00", "HI\x00\x00\x00"}}, }}}, {Key: StructKey{Name: "static_filename"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "static_filename", TypeSize: 33}, Fields: []Type{ &BufferType{TypeCommon: TypeCommon{TypeName: "filename", FldName: "f1", TypeSize: 10}, Kind: 3}, @@ -1346,4 +1346,4 @@ var consts_64 = []ConstValue{ {Name: "SYS_unsupported"}, } -const revision_64 = "108f16d364fe32a8c41e4592f79eab831b5935a0" +const revision_64 = "69825d8961f9b9d716935a1e9585b512ce8ef9b7" diff --git a/sys/test/test.txt b/sys/test/test.txt index 3ebbf5979..44ff228df 100644 --- a/sys/test/test.txt +++ b/sys/test/test.txt @@ -771,7 +771,7 @@ serialize0_struct { b string[serialize_strings, 5] } -serialize_strings = "aaa", "bbb" +serialize_strings = "aaa", "bbb", "hash", "HI" # Unsupported syscalls due to resources. -- cgit mrf-deployment