diff options
Diffstat (limited to 'utils/libcxx/test')
| -rw-r--r-- | utils/libcxx/test/config.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index c941f65b2c57..bd99e8ddd978 100644 --- a/utils/libcxx/test/config.py +++ b/utils/libcxx/test/config.py @@ -111,7 +111,8 @@ class Configuration(object): def make_static_lib_name(self, name): """Return the full filename for the specified library name""" if self.is_windows: - return name + '.lib' + assert name == 'c++' # Only allow libc++ to use this function for now. + return 'lib' + name + '.lib' else: return 'lib' + name + '.a' @@ -241,7 +242,7 @@ class Configuration(object): flags = [] compile_flags = _prefixed_env_list('INCLUDE', '-isystem') link_flags = _prefixed_env_list('LIB', '-L') - for path in _list_env_var('LIB'): + for path in _split_env_var('LIB'): self.add_path(self.exec_env, path) return CXXCompiler(clang_path, flags=flags, compile_flags=compile_flags, @@ -412,6 +413,13 @@ class Configuration(object): if self.is_windows: self.config.available_features.add('windows') + if self.cxx_stdlib_under_test == 'libc++': + # LIBCXX-WINDOWS-FIXME is the feature name used to XFAIL the + # initial Windows failures until they can be properly diagnosed + # and fixed. This allows easier detection of new test failures + # and regressions. Note: New failures should not be suppressed + # using this feature. + self.config.available_features.add('LIBCXX-WINDOWS-FIXME') # Attempt to detect the glibc version by querying for __GLIBC__ # in 'features.h'. |