diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-03-01 14:32:01 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-01 14:32:27 -0800 |
commit | f117a4d2c5d65c696638fc15fb4aa59cc52e66cf (patch) | |
tree | 957473ec87cfdd2b0f78bde65efb2b59bfda7cbd | |
parent | df1f1c1455fe84b081e3d8a8e556e48363b372fa (diff) |
fix other.test_dangerous_func_cast
-rwxr-xr-x | emscripten.py | 2 | ||||
-rw-r--r-- | tests/test_other.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py index 26c7d6ef..62a14c0e 100755 --- a/emscripten.py +++ b/emscripten.py @@ -1015,7 +1015,7 @@ def emscript_fast(infile, settings, outfile, libraries=[], compiler_engine=None, asm_setup += '\nfunction nullFunc_' + sig + '(x) { Module["printErr"]("Invalid function pointer' + pointer + 'called with signature \'' + sig + '\'. ' + \ 'Perhaps this is an invalid value (e.g. caused by calling a virtual method on a NULL pointer)? ' + \ 'Or calling a function with an incorrect type, which will fail? ' + \ - '(it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this) ' + \ + '(it is worth building your source files with -Werror (warnings are errors), as warnings can indicate undefined behavior which can cause this)' + \ '"); ' + extra + ' abort(x) }\n' basic_vars = ['STACKTOP', 'STACK_MAX', 'tempDoublePtr', 'ABORT'] diff --git a/tests/test_other.py b/tests/test_other.py index 5959e56d..b86af5cc 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -540,6 +540,7 @@ f.close() ''' open('src.c', 'w').write(src) def test(args, expected, err_expected=None): + print args, expected, err_expected out, err = Popen([PYTHON, EMCC, 'src.c'] + args, stderr=PIPE).communicate() if err_expected: self.assertContained(err_expected, err) self.assertContained(expected, run_js(self.in_dir('a.out.js'), stderr=PIPE, full_output=True)) |