aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/snippets.js8
-rw-r--r--tests/runner.py2
-rw-r--r--tests/sauer/command.cpp2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/snippets.js b/src/snippets.js
index 2f60015f..d32a0239 100644
--- a/src/snippets.js
+++ b/src/snippets.js
@@ -84,6 +84,14 @@ var Snippets = {
__assert_fail: function(condition, file, line) {
throw 'Assertion failed: ' + Pointer_stringify(condition);//JSON.stringify(arguments)//condition;
},
+
+ // Threading stuff LLVM adds sometimes
+ __cxa_guard_acquire: function() {
+ return 0;
+ },
+ __cxa_guard_release: function() {
+ return 0;
+ },
};
// Aliases
diff --git a/tests/runner.py b/tests/runner.py
index 35bae578..78e500ef 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -737,7 +737,7 @@ class T(unittest.TestCase):
# used, see Mozilla bug 593659.
assert PARSER_ENGINE != SPIDERMONKEY_ENGINE
# XXX RELOOP = 1 either is very very slow, or nonfinishing
- self.do_test(path_from_root(['tests', 'sauer']), '*\nTemp is 33\n9\n5\n*', main_file='command.cpp', emscripten_settings='{"RELOOP": 0}')
+ self.do_test(path_from_root(['tests', 'sauer']), '*\nTemp is 33\n9\n5\nhello, everyone\n*', main_file='command.cpp', emscripten_settings='{"RELOOP": 0}')
if __name__ == '__main__':
if DEBUG: print "LLVM_GCC:", LLVM_GCC
diff --git a/tests/sauer/command.cpp b/tests/sauer/command.cpp
index 0f9dc196..cfd3d116 100644
--- a/tests/sauer/command.cpp
+++ b/tests/sauer/command.cpp
@@ -1418,6 +1418,8 @@ int main()
execute("push x 11");
execute("pop x");
execute("echo $x");
+ execute("greet = [ echo hello, $arg1 ]");
+ execute("greet everyone");
printf("*\n");
return 0;
}