wasmate: fix some torture tests
diff --git a/buildbot/link_assembly_files.py b/buildbot/link_assembly_files.py
index 40ce436..ac12256 100755
--- a/buildbot/link_assembly_files.py
+++ b/buildbot/link_assembly_files.py
@@ -31,7 +31,7 @@
def link(infile, outfile, extras):
"""Create the command-line for a wasmate invocation."""
- return [extras['wasmate'], '-o', outfile, '-l', 'misctest', infile]
+ return [extras['wasmate'], '-o', outfile, '-l', 'torturetest', infile]
def run(wasmate, files, fails, out):
diff --git a/prototype-wasmate/known_gcc_test_failures.txt b/prototype-wasmate/known_gcc_test_failures.txt
index 456467b..8d7b640 100644
--- a/prototype-wasmate/known_gcc_test_failures.txt
+++ b/prototype-wasmate/known_gcc_test_failures.txt
@@ -1,12 +1,8 @@
# Expected failures from running wasmate on the GCC torture test output files.
-# can't resolve symbol
+# Address-taken labels in test cause "can't resolve symbol".
20071220-1.c.s
20071220-2.c.s
-921110-1.c.s
-930608-1.c.s
-bcp-1.c.s
-pr34456.c.s
# IndexError: pop from empty list
930930-1.c.s
diff --git a/prototype-wasmate/wasmate.py b/prototype-wasmate/wasmate.py
index 2ca5ab8..b0ff5da 100755
--- a/prototype-wasmate/wasmate.py
+++ b/prototype-wasmate/wasmate.py
@@ -66,6 +66,14 @@
'_Znwm': ('_Znwm', 'misctest', 'i32', 'i32'),
}
+# Environment for the GCC torture tests.
+torture_environment = {
+ 'abort': ('abort', 'torturetest', 'i32', ''),
+ 'f': ('f', 'torturetest', 'f64', 'f64'),
+ 'bad0': ('bad0', 'torturetest', 'i32', ''),
+ 'bad_compare': ('bad_compare', 'torturetest', 'i32', 'i32'),
+}
+
# Default to using the spectest environment for now.
import_environment = spectest_environment
@@ -703,6 +711,8 @@
import_environment = spectest_environment
if cmd_args.library == 'misctest':
import_environment = misctest_environment
+ if cmd_args.library == 'torturetest':
+ import_environment = torture_environment
else:
error("Unrecognized import environment name: " + cmd_args.library)
