@@ -29,19 +29,15 @@ def do_test_binaryen_js_with(which):
29
29
30
30
print ('\n [ checking binaryen.js testcases (' + which + ')... ]\n ' )
31
31
32
- for s in sorted (os .listdir (os .path .join (shared .options .binaryen_test , 'binaryen.js' ))):
33
- if not s .endswith ('.js' ):
34
- continue
35
- print (s )
36
- f = open ('a.mjs' , 'w' )
32
+ for s in shared .get_tests (shared .get_test_dir ('binaryen.js' ), ['.js' ]):
33
+ basename = os .path .basename (s )
34
+ outname = os .path .splitext (basename )[0 ] + '.mjs'
35
+ f = open (outname , 'w' )
37
36
# avoid stdout/stderr ordering issues in some js shells - use just stdout
38
- f .write ('''
39
- console.warn = console.error = console.log;
40
- ''' )
37
+ f .write ('console.warn = console.error = console.log;' )
41
38
binaryen_js = open (which ).read ()
42
39
f .write (binaryen_js )
43
- test_path = os .path .join (shared .options .binaryen_test , 'binaryen.js' , s )
44
- test_src = open (test_path ).read ()
40
+ test_src = open (s ).read ()
45
41
f .write (support .js_test_wrap ().replace ('%TEST%' , test_src ))
46
42
f .close ()
47
43
@@ -57,12 +53,12 @@ def test(cmd):
57
53
58
54
# run in all possible shells
59
55
if shared .MOZJS :
60
- test ([shared .MOZJS , '-m' , 'a.mjs' ])
56
+ test ([shared .MOZJS , '-m' , outname ])
61
57
if shared .NODEJS :
62
58
if node_has_wasm or 'WebAssembly.' not in test_src :
63
- test ([shared .NODEJS , 'a.mjs' ])
59
+ test ([shared .NODEJS , outname ])
64
60
else :
65
- print ('Skipping ' + test_path + ' because WebAssembly might not be supported' )
61
+ print ('Skipping ' + basename + ' because WebAssembly might not be supported' )
66
62
67
63
68
64
def update_binaryen_js_tests ():
@@ -78,12 +74,10 @@ def update_binaryen_js_tests():
78
74
node_has_wasm = shared .NODEJS and support .node_has_webassembly (shared .NODEJS )
79
75
for s in shared .get_tests (shared .get_test_dir ('binaryen.js' ), ['.js' ]):
80
76
basename = os .path .basename (s )
81
- print (basename )
82
- f = open ('a.mjs' , 'w' )
77
+ outname = os . path . splitext (basename )[ 0 ] + '.mjs'
78
+ f = open (outname , 'w' )
83
79
# avoid stdout/stderr ordering issues in some js shells - use just stdout
84
- f .write ('''
85
- console.warn = console.error = console.log;
86
- ''' )
80
+ f .write ('console.warn = console.error = console.log;' )
87
81
f .write (open (shared .BINARYEN_JS ).read ())
88
82
test_src = open (s ).read ()
89
83
f .write (support .js_test_wrap ().replace ('%TEST%' , test_src ))
@@ -100,9 +94,9 @@ def update(cmd):
100
94
101
95
# run in available shell
102
96
if shared .MOZJS :
103
- update ([shared .MOZJS , '-m' , 'a.mjs' ])
97
+ update ([shared .MOZJS , '-m' , outname ])
104
98
elif node_has_wasm or 'WebAssembly.' not in test_src :
105
- update ([shared .NODEJS , 'a.mjs' ])
99
+ update ([shared .NODEJS , outname ])
106
100
else :
107
101
print ('Skipping ' + basename + ' because WebAssembly might not be supported' )
108
102
0 commit comments