Skip to content

Avoid mutating options and settings in test_other.py. NFC #27674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbc100 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Open

Avoid mutating options and settings in test_other.py. NFC #27674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@

from tools import building, cache, response_file, shared, utils, webassembly
from tools.building import get_building_env
from tools.cmdline import options
from tools.link import binary_encode
from tools.settings import settings
from tools.shared import (
CLANG_CC,
CLANG_CXX,
Expand Down Expand Up @@ -768,6 +766,14 @@ def test_emcc_cflags(self):
self.run_process([EMCC, 'out.o'] + self.get_cflags())
self.assertContained('Hello, world!', self.run_js('a.out.js'))

def get_expected_lib_dir(self, args):
target = 'wasm64-emscripten' if '-m64' in args else 'wasm32-emscripten'
cache_dir = Path(self.run_process([EMCONFIG, 'CACHE'], stdout=PIPE).stdout.strip())
libdir = cache_dir / 'sysroot' / 'lib' / target
if '-flto' in args:
libdir /= 'lto'
return libdir

@crossplatform
@parameterized({
'': ([],),
Expand All @@ -783,9 +789,7 @@ def test_print_search_dirs(self, args):
libpath = output.split('libraries: =', 1)[1].strip()
libpath = libpath.split(os.pathsep)
libpath = [Path(p) for p in libpath]
options.lto = 'full' if '-flto' in args else None
settings.MEMORY64 = int('-m64' in args)
expected = cache.get_lib_dir(absolute=True)
expected = self.get_expected_lib_dir(args)
self.assertIn(expected, libpath)

@crossplatform
Expand All @@ -798,11 +802,8 @@ def test_print_libgcc_file_name(self, args):
output = self.run_process([EMCC, '-print-libgcc-file-name'] + args, stdout=PIPE).stdout
output2 = self.run_process([EMCC, '--print-libgcc-file-name'] + args, stdout=PIPE).stdout
self.assertEqual(output, output2)
options.lto = 'full' if '-flto' in args else None
settings.MEMORY64 = int('-m64' in args)
libdir = cache.get_lib_dir(absolute=True)
expected = os.path.join(libdir, 'libclang_rt.builtins.a')
self.assertEqual(output.strip(), expected)
expected = self.get_expected_lib_dir(args) / 'libclang_rt.builtins.a'
self.assertEqual(Path(output.strip()), expected)

@crossplatform
def test_print_resource_dir(self):
Expand Down Expand Up @@ -834,10 +835,8 @@ def test_print_file_name(self, args):
output = self.run_process([EMCC, '-print-file-name=libc.a'] + args, stdout=PIPE).stdout.rstrip()
output2 = self.run_process([EMCC, '--print-file-name=libc.a'] + args, stdout=PIPE).stdout.rstrip()
self.assertEqual(output, output2)
filename = Path(output)
options.lto = 'full' if '-flto' in args else None
settings.MEMORY64 = int('-m64' in args)
self.assertContained(cache.get_lib_name('libc.a'), str(filename))
expected = self.get_expected_lib_dir(args) / 'libc.a'
self.assertEqual(Path(output), expected)

@crossplatform
def test_print_file_name_resdir(self):
Expand Down Expand Up @@ -16071,6 +16070,7 @@ def test_setting_sets_validity(self):
INTERNAL_SETTINGS,
JS_ONLY_SETTINGS,
MEM_SIZE_SETTINGS,
settings,
)
setting_names = (
COMPILE_TIME_SETTINGS
Expand Down
Loading