@@ -5599,9 +5599,8 @@ def test_files(self):
5599
5599
# Sadly --closure=2 is not yet free of closure warnings
5600
5600
# FIXME(https://github.com/emscripten-core/emscripten/issues/17080)
5601
5601
self .ldflags .append ('-Wno-error=closure' )
5602
- elif self .maybe_closure ():
5603
- # closure can generate variables called 'gc', which pick up js shell stuff
5604
- self .banned_js_engines = [config .SPIDERMONKEY_ENGINE ]
5602
+ else :
5603
+ self .maybe_closure ()
5605
5604
5606
5605
self .emcc_args += ['--pre-js' , 'pre.js' ]
5607
5606
self .set_setting ('FORCE_FILESYSTEM' )
@@ -5873,8 +5872,8 @@ def test_futimens(self):
5873
5872
self .do_runf (test_file ('utime' , 'test_futimens.c' ), 'success' )
5874
5873
5875
5874
@no_minimal_runtime ('MINIMAL_RUNTIME does not have getValue() and setValue() (TODO add it to a JS library function to get it in)' )
5875
+ @requires_node # only node handles utf well
5876
5876
def test_utf (self ):
5877
- self .banned_js_engines = [config .SPIDERMONKEY_ENGINE ] # only node handles utf well
5878
5877
self .set_setting ('EXPORTED_FUNCTIONS' , ['_main' , '_malloc' , '_free' ])
5879
5878
self .set_setting ('EXPORTED_RUNTIME_METHODS' , ['getValue' , 'setValue' , 'UTF8ToString' , 'stringToUTF8' ])
5880
5879
self .do_core_test ('test_utf.c' )
@@ -8742,9 +8741,9 @@ def test(assert_returncode=0):
8742
8741
assert ('require(' in js ) == ('node' in self .get_setting ('ENVIRONMENT' )), 'we should have require() calls only if node js specified'
8743
8742
8744
8743
for engine in config .JS_ENGINES :
8745
- print (engine )
8744
+ print (f' engine: { engine } ' )
8746
8745
# set us to test in just this engine
8747
- self .banned_js_engines = [ e for e in config . JS_ENGINES if e != engine ]
8746
+ self .require_engine ( engine )
8748
8747
# tell the compiler to build with just that engine
8749
8748
if engine == config .NODE_JS :
8750
8749
right = 'node'
@@ -8824,9 +8823,8 @@ def test_minimal_runtime_no_declare_asm_module_exports(self):
8824
8823
'streaming_inst' : (['-sMINIMAL_RUNTIME_STREAMING_WASM_INSTANTIATION' ],),
8825
8824
'no_export' : (['-sDECLARE_ASM_MODULE_EXPORTS=0' ],)
8826
8825
})
8826
+ @requires_node # TODO: Support for non-Node.js shells under MINIMAL_RUNTIME
8827
8827
def test_minimal_runtime_hello_world (self , args ):
8828
- # TODO: Support for non-Node.js shells has not yet been added to MINIMAL_RUNTIME
8829
- self .banned_js_engines = [config .V8_ENGINE , config .SPIDERMONKEY_ENGINE ]
8830
8828
self .emcc_args = args
8831
8829
self .set_setting ('MINIMAL_RUNTIME' )
8832
8830
self .maybe_closure ()
0 commit comments