Skip to content

Commit 9520019

Browse files
committed
tests: Removal of @no_wasm_backend, part 1
This change removes the use of this decorator from the other and sanity test suites. Some tests simply worked, some make no sense with wasm backend and a couple are tests we would like revive once day (related to ctor evaluation and ctor elimiation). There was one test for which I implemented the feature which was to ingnore multiple copies of the same .so file on the link line. This improves the fake shared library support a little and was a feature of fastcomp. See: #12335
1 parent 95358a3 commit 9520019

File tree

6 files changed

+47
-304
lines changed

6 files changed

+47
-304
lines changed

emcc.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,22 @@ def check(input_file):
12041204
return [f for f in inputs if check(f[1])]
12051205
return inputs
12061206

1207+
def filter_out_duplicate_dynamic_libs(inputs):
1208+
# Filter out duplicat eshared libraries.
1209+
# See test_core.py:test_redundant_link
1210+
seen = set(inputs)
1211+
rtn = []
1212+
for i in inputs:
1213+
if get_file_suffix(i[1]) in DYNAMICLIB_ENDINGS and os.path.exists(i[1]):
1214+
abspath = os.path.abspath(i[1])
1215+
if abspath in seen:
1216+
continue
1217+
seen.add(abspath)
1218+
rtn.append(i)
1219+
return rtn
1220+
12071221
input_files = filter_out_dynamic_libs(input_files)
1222+
input_files = filter_out_duplicate_dynamic_libs(input_files)
12081223

12091224
if not input_files and not link_flags:
12101225
exit_with_error('no input files')

src/settings.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,6 @@ var ALLOW_TABLE_GROWTH = 0;
222222
// default, any other value will be used as an override
223223
var GLOBAL_BASE = -1;
224224

225-
// Warn at compile time about instructions that LLVM tells us are not fully
226-
// aligned. This is useful to find places in your code where you might refactor
227-
// to ensure proper alignment. This is currently only supported in asm.js, not
228-
// wasm.
229-
var WARN_UNALIGNED = 0;
230-
231225
// Whether closure compiling is being run on this output
232226
var USE_CLOSURE_COMPILER = 0;
233227

@@ -1698,4 +1692,5 @@ var LEGACY_SETTINGS = [
16981692
['RUNNING_JS_OPTS', [0], 'Fastcomp cared about running JS which could alter asm.js validation, but not upstream'],
16991693
['EXPORT_FUNCTION_TABLES', [0], 'No longer needed'],
17001694
['BINARYEN_SCRIPTS', [""], 'No longer needed'],
1695+
['WARN_UNALIGNED', [0, 1], 'No longer needed'],
17011696
];

tests/runner.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ def no_wasm_backend(note=''):
164164
return unittest.skip(note)
165165

166166

167+
def disabled(note=''):
168+
assert not callable(note)
169+
return unittest.skip(note)
170+
171+
167172
def no_windows(note=''):
168173
assert not callable(note)
169174
if WINDOWS:

tests/sillyfuncast2_noasm.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
; ModuleID = 'tests/hello_world.bc'
22
target datalayout = "e-p:32:32-i64:64-v128:32:128-n32-S128"
3-
target triple = "asmjs-unknown-emscripten"
43

54
@.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
65

0 commit comments

Comments
 (0)