Skip to content

Commit e998705

Browse files
authored
Reenable bullet with debug info (#14279)
Now that we have fixed #14255, This reenables bullet test with debug info enabled.
1 parent 4eede00 commit e998705

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

tests/test_core.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6145,10 +6145,6 @@ def test_zlib(self, use_cmake):
61456145
})
61466146
# Called thus so it runs late in the alphabetical cycle... it is long
61476147
def test_bullet(self, use_cmake):
6148-
if not use_cmake:
6149-
# Temporarily disabled
6150-
self.skipTest('https://github.com/emscripten-core/emscripten/issues/14255')
6151-
61526148
if WINDOWS and not use_cmake:
61536149
self.skipTest("Windows cannot run configure sh scripts")
61546150

tools/ports/bullet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ def create(final):
4545
for dir in dirs:
4646
includes.append(os.path.join(root, dir))
4747

48-
# Debug info temporarly disabled due to: https://github.com/emscripten-core/emscripten/issues/14255
49-
ports.build_port(src_path, final, includes=includes, exclude_dirs=['MiniCL'], debug_info=False)
48+
ports.build_port(src_path, final, includes=includes, exclude_dirs=['MiniCL'])
5049

5150
return [shared.Cache.get_lib('libbullet.a', create)]
5251

tools/ports/mpg123.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ def create(output_path):
8484
commands.append([shared.EMCC, '-c', src, '-O2', '-o', obj, '-w'] + flags)
8585
objects.append(obj)
8686

87-
# Debug info temporarly disabled due to: https://github.com/emscripten-core/emscripten/issues/14255
88-
ports.run_commands(commands, debug_info=False)
87+
ports.run_commands(commands)
8988
ports.create_lib(output_path, objects)
9089

9190
# copy header to a location so it can be used as 'MPG123/'

tools/system_libs.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,10 @@ def dir_is_newer(dir_a, dir_b):
5656
return newest_a < newest_b
5757

5858

59-
def get_base_cflags(force_object_files=False, debug_info=True):
59+
def get_base_cflags(force_object_files=False):
6060
# Always build system libraries with debug information. Non-debug builds
6161
# will ignore this at link time because we link with `-strip-debug`.
62-
flags = []
63-
if debug_info:
64-
flags.append('-g')
62+
flags = ['-g']
6563
if settings.LTO and not force_object_files:
6664
flags += ['-flto=' + settings.LTO]
6765
if settings.RELOCATABLE:
@@ -1638,7 +1636,7 @@ def install_headers(src_dir, pattern="*.h", target=None):
16381636
shutil.copyfile(f, os.path.join(dest, os.path.basename(f)))
16391637

16401638
@staticmethod
1641-
def build_port(src_path, output_path, includes=[], flags=[], exclude_files=[], exclude_dirs=[], debug_info=True):
1639+
def build_port(src_path, output_path, includes=[], flags=[], exclude_files=[], exclude_dirs=[]):
16421640
srcs = []
16431641
for root, dirs, files in os.walk(src_path, topdown=False):
16441642
if any((excluded in root) for excluded in exclude_dirs):
@@ -1658,19 +1656,19 @@ def build_port(src_path, output_path, includes=[], flags=[], exclude_files=[], e
16581656
commands.append([shared.EMCC, '-c', src, '-O2', '-o', obj, '-w'] + include_commands + flags)
16591657
objects.append(obj)
16601658

1661-
Ports.run_commands(commands, debug_info=debug_info)
1659+
Ports.run_commands(commands)
16621660
create_lib(output_path, objects)
16631661
return output_path
16641662

16651663
@staticmethod
1666-
def run_commands(commands, debug_info=True):
1664+
def run_commands(commands):
16671665
# Runs a sequence of compiler commands, adding importand cflags as defined by get_cflags() so
16681666
# that the ports are built in the correct configuration.
16691667
def add_args(cmd):
16701668
# this must only be called on a standard build command
16711669
assert cmd[0] in (shared.EMCC, shared.EMXX)
16721670
# add standard cflags, but also allow the cmd to override them
1673-
return cmd[:1] + get_base_cflags(debug_info=debug_info) + cmd[1:]
1671+
return cmd[:1] + get_base_cflags() + cmd[1:]
16741672
run_build_commands([add_args(c) for c in commands])
16751673

16761674
@staticmethod

0 commit comments

Comments
 (0)