Skip to content
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.

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

Fix other.test_emcc_print_file_name under windows. NFC #17261

Merged
merged 1 commit into from
Jun 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ jobs:
other.test_embed_file_dup
other.test_dot_a_all_contents_invalid
other.test_emcc_print_search_dirs
other.test_emcc_print_file_name
other.test_pkg_config*"
# Run a single websockify-based test to ensure it works on windows.
- run-tests:
Expand Down
3 changes: 2 additions & 1 deletion tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,8 @@ def test_emcc_print_search_dirs(self):
def test_emcc_print_file_name(self):
self.run_process([EMBUILDER, 'build', 'libc'])
output = self.run_process([EMCC, '-print-file-name=libc.a'], stdout=PIPE).stdout
self.assertContained(shared.Cache.get_lib_name('libc.a'), output)
filename = Path(output)
self.assertContained(shared.Cache.get_lib_name('libc.a'), str(filename))

def test_emar_em_config_flag(self):
# Test that the --em-config flag is accepted but not passed down do llvm-ar.
Expand Down