diff options
author | Jukka Jylänki <jujjyl@gmail.com> | 2014-02-25 00:24:24 +0200 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2014-02-25 00:24:24 +0200 |
commit | 5756f82b74c076dd0ce3226f0eb0e713f70d8915 (patch) | |
tree | 9e8e3aacb3f8bf685c0582449f942b09505a854a /tests/emscripten_log | |
parent | 11a75881530903c2e4e16e51664c70c2a5a397c5 (diff) |
Fix emscripten_get_callstack to work on Firefox 30 after it implemented column information in callstack info. See https://bugzilla.mozilla.org/show_bug.cgi?id=762556 . Fixes test browser.test_emscripten_log on Firefox 30.
Diffstat (limited to 'tests/emscripten_log')
-rw-r--r-- | tests/emscripten_log/emscripten_log.cpp | 8 |
1 files changed, 4 insertions, 4 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; |