test_core.py: remove @no_wasm decorator

See: #12335

Author: sbc100

tests/emscripten_log/emscripten_log.cpp

@@ -105,23 +105,6 @@ void __attribute__((noinline)) bar(int = 0, char * = 0, double = 0) // Arbitrary
 	MYASSERT(!!strstr(buffer, "at bar(int,"), "Truncated callstack was %s!", buffer);
 	MYASSERT(buffer[20] == 0x01, "");
 	delete[] buffer;
-
-	/* With EM_LOG_JS_STACK, the callstack will be
-		at __Z3bariPcd (src.cpp.o.js:5394:12)
-		at __Z3FooIiEvv (src.cpp.o.js:5417:4)
-		at Object._main (src.cpp.o.js:5404:2)
-		at Object.callMain (src.cpp.o.js:71344:30)
-		at doRun (src.cpp.o.js:71383:25)
-		at run (src.cpp.o.js:71396:5)
-		at Object.<anonymous> (src.cpp.o.js:71439:1)
-		at Module._compile (module.js:456:26) */
-#ifdef RUN_FROM_JS_SHELL
-	MYASSERT(!!strstr(str, "at __Z3bariPcd (src.cpp"), "Callstack was %s!", str);
-	MYASSERT(!!strstr(str, "at __Z3FooIiEvv (src.cpp"), "Callstack was %s!", str);
-#else
-	MYASSERT(!!strstr(str, "at __Z3bariPcd (page.js"), "Callstack was %s!", str);
-	MYASSERT(!!strstr(str, "at __Z3FooIiEvv (page.js"), "Callstack was %s!", str);
-#endif
 }
 
 template<typename T>

tests/emscripten_log/emscripten_log_with_closure.txt renamed to tests/emscripten_log/emscripten_log_with_closure.out

@@ -24,7 +24,7 @@
 from tools import shared, building
 from runner import RunnerCore, path_from_root, requires_native_clang
 from runner import skip_if, no_wasm_backend, needs_dlfcn, no_windows, is_slow_test, create_test_file, parameterized
-from runner import js_engines_modify, wasm_engines_modify, env_modify, with_env_modify
+from runner import js_engines_modify, wasm_engines_modify, env_modify, with_env_modify, disabled
 from runner import NON_ZERO
 import clang_native
 
@@ -104,14 +104,6 @@ def metafunc(self, native_exceptions):
   return metafunc
 
 
-def no_wasm(note=''):
-  assert not callable(note)
-
-  def decorated(f):
-    return skip_if(f, 'is_wasm', note)
-  return decorated
-
-
 def no_wasm2js(note=''):
   assert not callable(note)
 
@@ -2721,7 +2713,7 @@ def test_dlfcn_i64(self):
     self.do_run(src, '|65830|')
 
   @needs_dlfcn
-  @no_wasm('EM_ASM in shared wasm modules, stored inside the wasm somehow')
+  @disabled('EM_ASM in not yet supported in SIDE_MODULE')
   def test_dlfcn_em_asm(self):
     self.prep_dlfcn_lib()
     create_test_file('liblib.cpp', '''
@@ -3771,76 +3763,6 @@ def test_dylink_static_funcpointers(self):
       expected='hello 0\nhello 1\nhello 2\n',
       header='typedef void (*voidfunc)(); void sidey(voidfunc f);', force_c=True)
 
-  @no_wasm('uses function tables in an asm.js specific way')
-  @needs_dlfcn
-  def test_dylink_asmjs_funcpointers(self):
-    self.dylink_test(
-      main=r'''
-      #include "header.h"
-      #include <emscripten.h>
-      void left1() { printf("left1\n"); }
-      void left2() { printf("left2\n"); }
-      voidfunc getleft1() { return left1; }
-      voidfunc getleft2() { return left2; }
-      int main(int argc, char **argv) {
-        printf("main\n");
-        EM_ASM({
-          // make the function table sizes a non-power-of-two
-          var newSize = alignFunctionTables();
-          //out('old size of function tables: ' + newSize);
-          while ((newSize & 3) !== 3) {
-            Module['FUNCTION_TABLE_v'].push(0);
-            newSize = alignFunctionTables();
-          }
-          //out('new size of function tables: ' + newSize);
-          // when masked, the two function pointers 1 and 2 should not happen to fall back to the right place
-          assert(((newSize+1) & 3) !== 1 || ((newSize+2) & 3) !== 2);
-          loadDynamicLibrary('liblib.so');
-        });
-        volatilevoidfunc f;
-        f = (volatilevoidfunc)left1;
-        f();
-        f = (volatilevoidfunc)left2;
-        f();
-        f = (volatilevoidfunc)getright1();
-        f();
-        f = (volatilevoidfunc)getright2();
-        f();
-        second();
-        return 0;
-      }
-      ''',
-      side=r'''
-      #include "header.h"
-      void right1() { printf("right1\n"); }
-      void right2() { printf("right2\n"); }
-      voidfunc getright1() { return right1; }
-      voidfunc getright2() { return right2; }
-      void second() {
-        printf("second\n");
-        volatilevoidfunc f;
-        f = (volatilevoidfunc)getleft1();
-        f();
-        f = (volatilevoidfunc)getleft2();
-        f();
-        f = (volatilevoidfunc)right1;
-        f();
-        f = (volatilevoidfunc)right2;
-        f();
-      }
-      ''',
-      expected='main\nleft1\nleft2\nright1\nright2\nsecond\nleft1\nleft2\nright1\nright2\n',
-      header='''
-      #include <stdio.h>
-      typedef void (*voidfunc)();
-      typedef volatile voidfunc volatilevoidfunc;
-      voidfunc getleft1();
-      voidfunc getleft2();
-      voidfunc getright1();
-      voidfunc getright2();
-      void second();
-      ''', need_reverse=False, auto_load=False, force_c=True)
-
   @needs_dlfcn
   def test_dylink_funcpointers_wrapper(self):
     self.dylink_test(
@@ -7272,8 +7194,7 @@ def post(filename):
 
     self.do_run_in_out_file_test('tests', 'core', 'modularize_closure_pre.c', post_build=post)
 
-  @no_wasm('wasmifying destroys debug info and stack tracability')
-  @no_wasm2js('source maps support')
+  @no_wasm2js('symbol names look different wasm2js backtraces')
   def test_emscripten_log(self):
     self.banned_js_engines = [V8_ENGINE] # v8 doesn't support console.log
     self.emcc_args += ['-s', 'DEMANGLE_SUPPORT=1']
@@ -7282,10 +7203,9 @@ def test_emscripten_log(self):
     self.emcc_args += ['-DRUN_FROM_JS_SHELL']
     self.do_run_in_out_file_test('tests', 'emscripten_log', 'emscripten_log.cpp')
     # test closure compiler as well
-    if self.run_name == 'asm2':
-      print('closure')
-      self.emcc_args += ['--closure', '1', '-g1'] # extra testing
-      self.do_run_in_out_file_test('tests', 'emscripten_log', 'emscripten_log_with_closure')
+    print('closure')
+    self.emcc_args += ['--closure', '1', '-g1'] # extra testing
+    self.do_run_in_out_file_test('tests', 'emscripten_log', 'emscripten_log_with_closure.cpp')
 
   def test_float_literals(self):
     self.do_run_in_out_file_test('tests', 'test_float_literals.cpp')