Skip to content

Commit 00091b2

Browse files
authored
Update spec test suite submodule (#1950)
Just a few minor updates to the harness, otherwise nothing major here.
1 parent 3bef34b commit 00091b2

File tree

1,352 files changed

+32900
-1141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,352 files changed

+32900
-1141
lines changed

tests/roundtrip.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fn find_tests() -> Vec<PathBuf> {
120120
/// time. There's further filters applied while testing.
121121
fn skip_test(test: &Path, contents: &[u8]) -> bool {
122122
let _ = contents;
123-
test.iter().any(|p| p == "exception-handling") && test.iter().any(|p| p == "legacy")
123+
test.iter().any(|p| p == "legacy")
124124
}
125125

126126
fn skip_validation(_test: &Path) -> bool {
@@ -681,6 +681,9 @@ impl TestState {
681681
"wide-arithmetic" => {
682682
features.insert(WasmFeatures::WIDE_ARITHMETIC);
683683
}
684+
"wasm-3.0" => {
685+
features.insert(WasmFeatures::WASM3);
686+
}
684687
_ => {}
685688
}
686689
}

tests/snapshots/testsuite/proposals/custom-page-sizes/custom-page-sizes-invalid.wast.json

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,148 +9,155 @@
99
"text": "invalid custom page size"
1010
},
1111
{
12-
"type": "assert_invalid",
13-
"line": 9,
14-
"filename": "custom-page-sizes-invalid.1.wasm",
15-
"module_type": "binary",
12+
"type": "assert_malformed",
13+
"line": 8,
14+
"filename": "custom-page-sizes-invalid.1.wat",
15+
"module_type": "text",
1616
"text": "invalid custom page size"
1717
},
1818
{
1919
"type": "assert_invalid",
20-
"line": 13,
20+
"line": 14,
2121
"filename": "custom-page-sizes-invalid.2.wasm",
2222
"module_type": "binary",
2323
"text": "invalid custom page size"
2424
},
2525
{
2626
"type": "assert_invalid",
27-
"line": 17,
27+
"line": 18,
2828
"filename": "custom-page-sizes-invalid.3.wasm",
2929
"module_type": "binary",
3030
"text": "invalid custom page size"
3131
},
3232
{
3333
"type": "assert_invalid",
34-
"line": 21,
34+
"line": 22,
3535
"filename": "custom-page-sizes-invalid.4.wasm",
3636
"module_type": "binary",
3737
"text": "invalid custom page size"
3838
},
3939
{
4040
"type": "assert_invalid",
41-
"line": 25,
41+
"line": 26,
4242
"filename": "custom-page-sizes-invalid.5.wasm",
4343
"module_type": "binary",
4444
"text": "invalid custom page size"
4545
},
4646
{
4747
"type": "assert_invalid",
48-
"line": 29,
48+
"line": 30,
4949
"filename": "custom-page-sizes-invalid.6.wasm",
5050
"module_type": "binary",
5151
"text": "invalid custom page size"
5252
},
5353
{
5454
"type": "assert_invalid",
55-
"line": 33,
55+
"line": 34,
5656
"filename": "custom-page-sizes-invalid.7.wasm",
5757
"module_type": "binary",
5858
"text": "invalid custom page size"
5959
},
6060
{
6161
"type": "assert_invalid",
62-
"line": 37,
62+
"line": 38,
6363
"filename": "custom-page-sizes-invalid.8.wasm",
6464
"module_type": "binary",
6565
"text": "invalid custom page size"
6666
},
6767
{
6868
"type": "assert_invalid",
69-
"line": 41,
69+
"line": 42,
7070
"filename": "custom-page-sizes-invalid.9.wasm",
7171
"module_type": "binary",
7272
"text": "invalid custom page size"
7373
},
7474
{
7575
"type": "assert_invalid",
76-
"line": 45,
76+
"line": 46,
7777
"filename": "custom-page-sizes-invalid.10.wasm",
7878
"module_type": "binary",
7979
"text": "invalid custom page size"
8080
},
8181
{
8282
"type": "assert_invalid",
83-
"line": 49,
83+
"line": 50,
8484
"filename": "custom-page-sizes-invalid.11.wasm",
8585
"module_type": "binary",
8686
"text": "invalid custom page size"
8787
},
8888
{
8989
"type": "assert_invalid",
90-
"line": 53,
90+
"line": 54,
9191
"filename": "custom-page-sizes-invalid.12.wasm",
9292
"module_type": "binary",
9393
"text": "invalid custom page size"
9494
},
9595
{
9696
"type": "assert_invalid",
97-
"line": 57,
97+
"line": 58,
9898
"filename": "custom-page-sizes-invalid.13.wasm",
9999
"module_type": "binary",
100100
"text": "invalid custom page size"
101101
},
102102
{
103103
"type": "assert_invalid",
104-
"line": 61,
104+
"line": 62,
105105
"filename": "custom-page-sizes-invalid.14.wasm",
106106
"module_type": "binary",
107107
"text": "invalid custom page size"
108108
},
109109
{
110110
"type": "assert_invalid",
111-
"line": 65,
111+
"line": 66,
112112
"filename": "custom-page-sizes-invalid.15.wasm",
113113
"module_type": "binary",
114114
"text": "invalid custom page size"
115115
},
116116
{
117117
"type": "assert_invalid",
118-
"line": 71,
118+
"line": 70,
119119
"filename": "custom-page-sizes-invalid.16.wasm",
120120
"module_type": "binary",
121121
"text": "invalid custom page size"
122122
},
123123
{
124-
"type": "assert_malformed",
125-
"line": 78,
124+
"type": "assert_invalid",
125+
"line": 76,
126126
"filename": "custom-page-sizes-invalid.17.wasm",
127127
"module_type": "binary",
128128
"text": "invalid custom page size"
129129
},
130+
{
131+
"type": "assert_malformed",
132+
"line": 83,
133+
"filename": "custom-page-sizes-invalid.18.wasm",
134+
"module_type": "binary",
135+
"text": "invalid custom page size"
136+
},
130137
{
131138
"type": "module",
132-
"line": 92,
139+
"line": 97,
133140
"name": "m",
134-
"filename": "custom-page-sizes-invalid.18.wasm",
141+
"filename": "custom-page-sizes-invalid.19.wasm",
135142
"module_type": "binary"
136143
},
137144
{
138145
"type": "register",
139-
"line": 96,
146+
"line": 101,
140147
"name": "m",
141148
"as": "m"
142149
},
143150
{
144151
"type": "assert_unlinkable",
145-
"line": 99,
146-
"filename": "custom-page-sizes-invalid.19.wasm",
152+
"line": 104,
153+
"filename": "custom-page-sizes-invalid.20.wasm",
147154
"module_type": "binary",
148155
"text": "memory types incompatible"
149156
},
150157
{
151158
"type": "assert_unlinkable",
152-
"line": 106,
153-
"filename": "custom-page-sizes-invalid.20.wasm",
159+
"line": 111,
160+
"filename": "custom-page-sizes-invalid.21.wasm",
154161
"module_type": "binary",
155162
"text": "memory types incompatible"
156163
}

tests/snapshots/testsuite/proposals/custom-page-sizes/custom-page-sizes-invalid.wast/18.print renamed to tests/snapshots/testsuite/proposals/custom-page-sizes/custom-page-sizes-invalid.wast/19.print

File renamed without changes.

tests/snapshots/testsuite/proposals/custom-page-sizes/custom-page-sizes.wast.json

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,150 @@
511511
"line": 106,
512512
"filename": "custom-page-sizes.9.wasm",
513513
"module_type": "binary"
514+
},
515+
{
516+
"type": "assert_malformed",
517+
"line": 113,
518+
"filename": "custom-page-sizes.10.wat",
519+
"module_type": "text",
520+
"text": "invalid custom page size"
521+
},
522+
{
523+
"type": "module",
524+
"line": 116,
525+
"filename": "custom-page-sizes.11.wasm",
526+
"module_type": "binary"
527+
},
528+
{
529+
"type": "assert_return",
530+
"line": 125,
531+
"action": {
532+
"type": "invoke",
533+
"field": "size",
534+
"args": []
535+
},
536+
"expected": [
537+
{
538+
"type": "i32",
539+
"value": "3"
540+
}
541+
]
542+
},
543+
{
544+
"type": "assert_return",
545+
"line": 126,
546+
"action": {
547+
"type": "invoke",
548+
"field": "load",
549+
"args": [
550+
{
551+
"type": "i32",
552+
"value": "0"
553+
}
554+
]
555+
},
556+
"expected": [
557+
{
558+
"type": "i32",
559+
"value": "120"
560+
}
561+
]
562+
},
563+
{
564+
"type": "assert_return",
565+
"line": 127,
566+
"action": {
567+
"type": "invoke",
568+
"field": "load",
569+
"args": [
570+
{
571+
"type": "i32",
572+
"value": "1"
573+
}
574+
]
575+
},
576+
"expected": [
577+
{
578+
"type": "i32",
579+
"value": "121"
580+
}
581+
]
582+
},
583+
{
584+
"type": "assert_return",
585+
"line": 128,
586+
"action": {
587+
"type": "invoke",
588+
"field": "load",
589+
"args": [
590+
{
591+
"type": "i32",
592+
"value": "2"
593+
}
594+
]
595+
},
596+
"expected": [
597+
{
598+
"type": "i32",
599+
"value": "122"
600+
}
601+
]
602+
},
603+
{
604+
"type": "assert_trap",
605+
"line": 129,
606+
"action": {
607+
"type": "invoke",
608+
"field": "load",
609+
"args": [
610+
{
611+
"type": "i32",
612+
"value": "3"
613+
}
614+
]
615+
},
616+
"text": "out of bounds"
617+
},
618+
{
619+
"type": "assert_return",
620+
"line": 130,
621+
"action": {
622+
"type": "invoke",
623+
"field": "grow",
624+
"args": [
625+
{
626+
"type": "i32",
627+
"value": "1"
628+
}
629+
]
630+
},
631+
"expected": [
632+
{
633+
"type": "i32",
634+
"value": "-1"
635+
}
636+
]
637+
},
638+
{
639+
"type": "module",
640+
"line": 133,
641+
"filename": "custom-page-sizes.12.wasm",
642+
"module_type": "binary"
643+
},
644+
{
645+
"type": "assert_return",
646+
"line": 138,
647+
"action": {
648+
"type": "invoke",
649+
"field": "size",
650+
"args": []
651+
},
652+
"expected": [
653+
{
654+
"type": "i32",
655+
"value": "1"
656+
}
657+
]
514658
}
515659
]
516660
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
(module
2+
(type (;0;) (func (result i32)))
3+
(type (;1;) (func (param i32) (result i32)))
4+
(memory (;0;) 1 1 (pagesize 0x1))
5+
(export "size" (func 0))
6+
(export "grow" (func 1))
7+
(export "load" (func 2))
8+
(func (;0;) (type 0) (result i32)
9+
memory.size
10+
)
11+
(func (;1;) (type 1) (param i32) (result i32)
12+
local.get 0
13+
memory.grow
14+
)
15+
(func (;2;) (type 1) (param i32) (result i32)
16+
local.get 0
17+
i32.load8_u
18+
)
19+
(data (;0;) (i32.const 0) "xyz")
20+
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
(module
2+
(type (;0;) (func (result i32)))
3+
(memory (;0;) 1 1 (pagesize 0x10000))
4+
(export "size" (func 0))
5+
(func (;0;) (type 0) (result i32)
6+
memory.size
7+
)
8+
(data (;0;) (i32.const 0) "xyz")
9+
)

0 commit comments

Comments
 (0)