From 854adf6f7fdc44e433ac9c13335c2a224635a42d Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sat, 18 Jun 2022 12:23:12 -0700 Subject: [PATCH] Fix other.test_emcc_print_file_name under windows. NFC (#17261) --- .circleci/config.yml | 1 + tests/test_other.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f0f2cff14c99..5b284af684483 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/tests/test_other.py b/tests/test_other.py index 7dda44f48b66e..c454e99a58e91 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -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.