diff --git a/test/other/test_emsize.out b/test/other/test_emsize.out index a2430bda17285..ef0fd233c3a7e 100644 --- a/test/other/test_emsize.out +++ b/test/other/test_emsize.out @@ -1,11 +1,11 @@ section size addr -TYPE 51 0 -IMPORT 31 0 -FUNCTION 14 0 -GLOBAL 9 0 -EXPORT 9 0 -ELEM 9 0 -CODE 1556 0 -DATA 77 0 +TYPE 51 10 +IMPORT 31 63 +FUNCTION 14 96 +GLOBAL 9 112 +EXPORT 9 123 +ELEM 9 134 +CODE 1556 146 +DATA 77 1704 JS 6756 0 Total 8512 diff --git a/test/test_other.py b/test/test_other.py index df9ac5d8dfb56..e19204728e84e 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -823,7 +823,6 @@ def test_em_config_missing_arg(self): out = self.expect_fail([EMCC, '--em-config']) self.assertContained('error: --em-config must be followed by a filename', out) - @disabled('Updating underlying tool output') def test_emsize(self): # test binaryen generated by running: # emcc test/hello_world.c -Oz --closure 1 -o test/other/test_emsize.js @@ -9701,11 +9700,10 @@ def test(dump_file): test('foo.wasm.dump') test('bar.wasm.dump') - @disabled('Updating underlying tool output') def test_emsymbolizer(self): def check_dwarf_loc_info(address, funcs, locs): out = self.run_process( - [emsymbolizer, '-tcode', '-s', 'dwarf', 'test_dwarf.wasm', address], + [emsymbolizer, '-s', 'dwarf', 'test_dwarf.wasm', address], stdout=PIPE).stdout for func in funcs: self.assertIn(func, out) @@ -9714,7 +9712,7 @@ def check_dwarf_loc_info(address, funcs, locs): def check_source_map_loc_info(address, loc): out = self.run_process( - [emsymbolizer, '-tcode', '-s', 'sourcemap', 'test_dwarf.wasm', + [emsymbolizer, '-s', 'sourcemap', 'test_dwarf.wasm', address], stdout=PIPE).stdout self.assertIn(loc, out) @@ -9727,7 +9725,7 @@ def check_source_map_loc_info(address, loc): # ... # 6: 41 00 i32.const 0 # ... - # The addresses here are the offsets to start of the code section. Returns + # The addresses here are the offsets to the start of the file. Returns # the address string in hexadecimal. def get_addr(text): out = self.run_process([common.LLVM_OBJDUMP, '-d', 'test_dwarf.wasm'],