@@ -181,6 +181,7 @@ def can_do_standalone(self):
181
181
self .get_setting ('STACK_OVERFLOW_CHECK' , 0 ) < 2 and \
182
182
not self .get_setting ('MINIMAL_RUNTIME' ) and \
183
183
not self .get_setting ('SAFE_HEAP' ) and \
184
+ not self .get_setting ('MEMORY64' ) and \
184
185
'-fsanitize=address' not in self .emcc_args
185
186
186
187
@@ -190,6 +191,8 @@ def decorated(self):
190
191
print ('wasmfs' )
191
192
if self .get_setting ('STANDALONE_WASM' ):
192
193
self .skipTest ("test currently cannot run both with WASMFS and STANDALONE_WASM" )
194
+ if self .get_setting ('MEMORY64' ):
195
+ self .skipTest ("test currently cannot run both with WASMFS and WASMFS" )
193
196
self .set_setting ('WASMFS' )
194
197
self .emcc_args = self .emcc_args .copy () + ['-DWASMFS' ]
195
198
func (self )
@@ -204,24 +207,25 @@ def metafunc(self, standalone):
204
207
if not standalone :
205
208
func (self )
206
209
else :
207
- if can_do_standalone (self ):
208
- self .set_setting ('STANDALONE_WASM' )
209
- # we will not legalize the JS ffi interface, so we must use BigInt
210
- # support in order for JS to have a chance to run this without trapping
211
- # when it sees an i64 on the ffi.
212
- self .set_setting ('WASM_BIGINT' )
213
- self .emcc_args .append ('-Wno-unused-command-line-argument' )
214
- # if we are impure, disallow all wasm engines
215
- if impure :
216
- self .wasm_engines = []
217
- self .js_engines = [config .NODE_JS ]
218
- self .node_args .append ('--experimental-wasm-bigint' )
210
+ if not can_do_standalone (self ):
211
+ self .skipTest ('Test configuration is not compatible with STANDALONE_WASM' )
212
+ self .set_setting ('STANDALONE_WASM' )
213
+ # we will not legalize the JS ffi interface, so we must use BigInt
214
+ # support in order for JS to have a chance to run this without trapping
215
+ # when it sees an i64 on the ffi.
216
+ self .set_setting ('WASM_BIGINT' )
217
+ self .emcc_args .append ('-Wno-unused-command-line-argument' )
218
+ # if we are impure, disallow all wasm engines
219
+ if impure :
220
+ self .wasm_engines = []
221
+ self .js_engines = [config .NODE_JS ]
222
+ self .node_args .append ('--experimental-wasm-bigint' )
223
+ func (self )
224
+ if wasm2c :
225
+ print ('wasm2c' )
226
+ self .set_setting ('WASM2C' )
227
+ self .wasm_engines = []
219
228
func (self )
220
- if wasm2c :
221
- print ('wasm2c' )
222
- self .set_setting ('WASM2C' )
223
- self .wasm_engines = []
224
- func (self )
225
229
226
230
metafunc ._parameterize = {'' : (False ,),
227
231
'standalone' : (True ,)}
0 commit comments