diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/emscripten_log/emscripten_log.cpp | 8 | ||||
| -rw-r--r-- | tests/test_browser.py | 7 | ||||
| -rw-r--r-- | tests/test_core.py | 4 | ||||
| -rw-r--r-- | tests/test_other.py | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/tests/emscripten_log/emscripten_log.cpp b/tests/emscripten_log/emscripten_log.cpp index a5bb8432..d7cfe484 100644 --- a/tests/emscripten_log/emscripten_log.cpp +++ b/tests/emscripten_log/emscripten_log.cpp @@ -83,14 +83,14 @@ void __attribute__((noinline)) bar(int = 0, char * = 0, double = 0) // Arbitrary if ((flags & EM_LOG_C_STACK) != 0) { - MYASSERT(!!strstr(callstack, "at bar(int, char*, double) (src.cpp:"), "Callstack was %s!", callstack); - MYASSERT(!!strstr(callstack, "at void Foo<int>() (src.cpp:"), "Callstack was %s!", callstack); + MYASSERT(!!strstr(callstack, ".cpp:"), "Callstack was %s!", callstack); } else { - MYASSERT(!!strstr(callstack, "at bar(int, char*, double) (src.cpp.o.js:"), "Callstack was %s!", callstack); - MYASSERT(!!strstr(callstack, "at void Foo<int>() (src.cpp.o.js:"), "Callstack was %s!", callstack); + MYASSERT(!!strstr(callstack, ".js:"), "Callstack was %s!", callstack); } + MYASSERT(!!strstr(callstack, "at bar(int, char*, double)"), "Callstack was %s!", callstack); + MYASSERT(!!strstr(callstack, "at void Foo<int>()"), "Callstack was %s!", callstack); // 5. Clean up. delete[] callstack; diff --git a/tests/test_browser.py b/tests/test_browser.py index 911e3269..f2e17ea0 100644 --- a/tests/test_browser.py +++ b/tests/test_browser.py @@ -747,8 +747,11 @@ function assert(x, y) { if (!x) throw 'assertion failed ' + y } var windowClose = window.close; window.close = function() { - doReftest(); - setTimeout(windowClose, 1000); + // wait for rafs to arrive and the screen to update before reftesting + setTimeout(function() { + doReftest(); + setTimeout(windowClose, 1000); + }, 1000); }; </script> </body>''' % open('reftest.js').read()) diff --git a/tests/test_core.py b/tests/test_core.py index 9898cb50..19bb9ca1 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -3958,9 +3958,9 @@ def process(filename): post = ''' def process(filename): src = \'\'\' - var data = [10, 20, 40, 30]; var Module = { - stdin: function() { return data.pop() || null }, + data: [10, 20, 40, 30], + stdin: function() { return Module.data.pop() || null }, stdout: function(x) { Module.print('got: ' + x) } }; \'\'\' + open(filename, 'r').read() diff --git a/tests/test_other.py b/tests/test_other.py index 8bc056e6..69f8d5c0 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -19,7 +19,7 @@ class other(RunnerCore): output = Popen([PYTHON, compiler, '--version'], stdout=PIPE, stderr=PIPE).communicate() output = output[0].replace('\r', '') self.assertContained('''emcc (Emscripten GCC-like replacement)''', output) - self.assertContained('''Copyright (C) 2013 the Emscripten authors (see AUTHORS.txt) + self.assertContained('''Copyright (C) 2014 the Emscripten authors (see AUTHORS.txt) This is free and open source software under the MIT license. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ''', output) |