diff --git a/libcxx/test/configs/llvm-libc++-mingw.cfg.in b/libcxx/test/configs/llvm-libc++-mingw.cfg.in --- a/libcxx/test/configs/llvm-libc++-mingw.cfg.in +++ b/libcxx/test/configs/llvm-libc++-mingw.cfg.in @@ -14,13 +14,6 @@ '%{executor} --execdir %T --env PATH=%{lib} -- ' )) -# 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. (Also see llvm.org/PR32730) -config.available_features.add('LIBCXX-WINDOWS-FIXME') - import os, site site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils')) import libcxx.test.params, libcxx.test.newconfig diff --git a/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in b/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in --- a/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in +++ b/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in @@ -14,13 +14,6 @@ '%{executor} --execdir %T --env PATH=%{lib} -- ' )) -# 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. (Also see llvm.org/PR32730) -config.available_features.add('LIBCXX-WINDOWS-FIXME') - import os, site site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils')) import libcxx.test.params, libcxx.test.newconfig diff --git a/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in b/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in --- a/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in +++ b/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in @@ -14,13 +14,6 @@ '%{executor} --execdir %T --env PATH=%{lib} -- ' )) -# 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. (Also see llvm.org/PR32730) -config.available_features.add('LIBCXX-WINDOWS-FIXME') - import os, site site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils')) import libcxx.test.params, libcxx.test.newconfig diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -133,7 +133,6 @@ self.configure_env() self.configure_coverage() self.configure_substitutions() - self.configure_features() libcxx.test.newconfig.configure( libcxx.test.params.DEFAULT_PARAMETERS, @@ -222,16 +221,6 @@ else: self.libcxx_obj_root = self.project_obj_root - def configure_features(self): - if self.target_info.is_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. (Also see llvm.org/PR32730) - self.config.available_features.add('LIBCXX-WINDOWS-FIXME') - def configure_compile_flags(self): self.configure_default_compile_flags() # Configure extra flags