Skip to content

Commit bda3fd4

Browse files
kateinoigakukunkateinoigakukun
committed
Remove too implementation-specific test cases for the VM now
1 parent 807db0a commit bda3fd4

File tree

4 files changed

+85
-695
lines changed

4 files changed

+85
-695
lines changed

‎Tests/WasmKitTests/Execution/HostModuleTests.swift

Lines changed: 85 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,85 @@
1-
//import XCTest
2-
//
3-
//@testable import WasmKit
4-
//
5-
//final class HostModuleTests: XCTestCase {
6-
// func testImportMemory() throws {
7-
// let runtime = Runtime()
8-
// let memoryType = MemoryType(min: 1, max: nil)
9-
// let memoryAddr = runtime.store.allocate(memoryType: memoryType)
10-
// try runtime.store.register(HostModule(memories: ["memory": memoryAddr]), as: "env")
11-
//
12-
// let module = Module(
13-
// imports: [
14-
// Import(module: "env", name: "memory", descriptor: .memory(memoryType))
15-
// ]
16-
// )
17-
// XCTAssertNoThrow(try runtime.instantiate(module: module))
18-
// // Ensure the allocated address is valid
19-
// _ = runtime.store.memory(at: memoryAddr)
20-
// }
21-
//
22-
// func testReentrancy() throws {
23-
// let runtime = Runtime()
24-
// let voidSignature = FunctionType(parameters: [], results: [])
25-
// let module = Module(
26-
// types: [voidSignature],
27-
// functions: [
28-
// // [0] (import "env" "bar" func)
29-
// // [1] (import "env" "qux" func)
30-
// // [2] "foo"
31-
// GuestFunction(
32-
// type: 0, locals: [],
33-
// body: [
34-
// .control(.call(functionIndex: 0)),
35-
// .control(.call(functionIndex: 0)),
36-
// .control(.call(functionIndex: 0)),
37-
// ]),
38-
// // [3] "bar"
39-
// GuestFunction(
40-
// type: 0, locals: [],
41-
// body: [
42-
// .control(.call(functionIndex: 1))
43-
// ]),
44-
// ],
45-
// imports: [
46-
// Import(module: "env", name: "bar", descriptor: .function(0)),
47-
// Import(module: "env", name: "qux", descriptor: .function(0)),
48-
// ],
49-
// exports: [
50-
// Export(name: "foo", descriptor: .function(2)),
51-
// Export(name: "baz", descriptor: .function(3)),
52-
// ]
53-
// )
54-
//
55-
// var isExecutingFoo = false
56-
// var isQuxCalled = false
57-
// let hostModule = HostModule(
58-
// functions: [
59-
// "bar": HostFunction(type: voidSignature) { caller, _ in
60-
// // Ensure "invoke" executes instructions under the current call
61-
// XCTAssertFalse(isExecutingFoo, "bar should not be called recursively")
62-
// isExecutingFoo = true
63-
// defer { isExecutingFoo = false }
64-
// let foo = try XCTUnwrap(caller.instance.exportedFunction(name: "baz"))
65-
// _ = try foo.invoke([], runtime: caller.runtime)
66-
// return []
67-
// },
68-
// "qux": HostFunction(type: voidSignature) { _, _ in
69-
// XCTAssertTrue(isExecutingFoo)
70-
// isQuxCalled = true
71-
// return []
72-
// },
73-
// ]
74-
// )
75-
// try runtime.store.register(hostModule, as: "env")
76-
// let instance = try runtime.instantiate(module: module)
77-
// // Check foo(wasm) -> bar(host) -> baz(wasm) -> qux(host)
78-
// _ = try runtime.invoke(instance, function: "foo")
79-
// XCTAssertTrue(isQuxCalled)
80-
// }
81-
//}
1+
import XCTest
2+
3+
@testable import WasmKit
4+
5+
final class HostModuleTests: XCTestCase {
6+
func testImportMemory() throws {
7+
let runtime = Runtime()
8+
let memoryType = MemoryType(min: 1, max: nil)
9+
let memoryAddr = runtime.store.allocate(memoryType: memoryType)
10+
try runtime.store.register(HostModule(memories: ["memory": memoryAddr]), as: "env")
11+
12+
let module = Module(
13+
imports: [
14+
Import(module: "env", name: "memory", descriptor: .memory(memoryType))
15+
]
16+
)
17+
XCTAssertNoThrow(try runtime.instantiate(module: module))
18+
// Ensure the allocated address is valid
19+
_ = runtime.store.memory(at: memoryAddr)
20+
}
21+
22+
func testReentrancy() throws {
23+
let runtime = Runtime()
24+
let voidSignature = FunctionType(parameters: [], results: [])
25+
let module = Module(
26+
types: [voidSignature],
27+
functions: [
28+
// [0] (import "env" "bar" func)
29+
// [1] (import "env" "qux" func)
30+
// [2] "foo"
31+
GuestFunction(
32+
type: 0, locals: [],
33+
body: {
34+
[
35+
.call(functionIndex: 0),
36+
.call(functionIndex: 0),
37+
.call(functionIndex: 0),
38+
]
39+
}),
40+
// [3] "bar"
41+
GuestFunction(
42+
type: 0, locals: [],
43+
body: {
44+
[
45+
.control(.call(functionIndex: 1))
46+
]
47+
}),
48+
],
49+
imports: [
50+
Import(module: "env", name: "bar", descriptor: .function(0)),
51+
Import(module: "env", name: "qux", descriptor: .function(0)),
52+
],
53+
exports: [
54+
Export(name: "foo", descriptor: .function(2)),
55+
Export(name: "baz", descriptor: .function(3)),
56+
]
57+
)
58+
59+
var isExecutingFoo = false
60+
var isQuxCalled = false
61+
let hostModule = HostModule(
62+
functions: [
63+
"bar": HostFunction(type: voidSignature) { caller, _ in
64+
// Ensure "invoke" executes instructions under the current call
65+
XCTAssertFalse(isExecutingFoo, "bar should not be called recursively")
66+
isExecutingFoo = true
67+
defer { isExecutingFoo = false }
68+
let foo = try XCTUnwrap(caller.instance.exportedFunction(name: "baz"))
69+
_ = try foo.invoke([], runtime: caller.runtime)
70+
return []
71+
},
72+
"qux": HostFunction(type: voidSignature) { _, _ in
73+
XCTAssertTrue(isExecutingFoo)
74+
isQuxCalled = true
75+
return []
76+
},
77+
]
78+
)
79+
try runtime.store.register(hostModule, as: "env")
80+
let instance = try runtime.instantiate(module: module)
81+
// Check foo(wasm) -> bar(host) -> baz(wasm) -> qux(host)
82+
_ = try runtime.invoke(instance, function: "foo")
83+
XCTAssertTrue(isQuxCalled)
84+
}
85+
}

0 commit comments

Comments
 (0)