diff options
Diffstat (limited to 'libcxx/utils')
| -rwxr-xr-x | libcxx/utils/ci/macos-backdeployment.sh | 1 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 18 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/target_info.py | 9 |
3 files changed, 4 insertions, 24 deletions
diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh index c3f6376f272..aaed799a304 100755 --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -167,7 +167,6 @@ echo "@@@@@@" echo "@@@ Running tests for libc++ @@@" "${LIBCXX_BUILD_DIR}/bin/llvm-lit" -sv "${LIBCXX_ROOT}/test" \ --param=enable_experimental=false \ - --param=enable_filesystem=false \ ${LIT_ARCH_STRING} \ --param=cxx_under_test="${CXX}" \ --param=cxx_headers="${LIBCXX_INSTALL_DIR}/include/c++/v1" \ diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 999c5acab3b..2fead3a2f82 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -332,8 +332,6 @@ class Configuration(object): # FIXME this is a hack. if self.get_lit_conf('enable_experimental') is None: self.config.enable_experimental = 'true' - if self.get_lit_conf('enable_filesystem') is None: - self.config.enable_filesystem = 'true' def configure_use_clang_verify(self): '''If set, run clang with -verify on failing tests.''' @@ -707,10 +705,6 @@ class Configuration(object): self.cxx.compile_flags += ['-D_LIBCPP_ABI_UNSTABLE'] def configure_filesystem_compile_flags(self): - enable_fs = self.get_lit_bool('enable_filesystem', default=False) - if not enable_fs: - return - self.config.available_features.add('c++filesystem') static_env = os.path.join(self.libcxx_src_root, 'test', 'std', 'input.output', 'filesystems', 'Inputs', 'static_test_env') static_env = os.path.realpath(static_env) @@ -748,12 +742,8 @@ class Configuration(object): self.configure_link_flags_abi_library() self.configure_extra_library_flags() elif self.cxx_stdlib_under_test == 'libstdc++': - enable_fs = self.get_lit_bool('enable_filesystem', - default=False) - if enable_fs: - self.config.available_features.add('c++experimental') - self.cxx.link_flags += ['-lstdc++fs'] - self.cxx.link_flags += ['-lm', '-pthread'] + self.config.available_features.add('c++experimental') + self.cxx.link_flags += ['-lstdc++fs', '-lm', '-pthread'] elif self.cxx_stdlib_under_test == 'msvc': # FIXME: Correctly setup debug/release flags here. pass @@ -803,10 +793,6 @@ class Configuration(object): if libcxx_experimental: self.config.available_features.add('c++experimental') self.cxx.link_flags += ['-lc++experimental'] - libcxx_fs = self.get_lit_bool('enable_filesystem', default=False) - if libcxx_fs: - self.config.available_features.add('c++fs') - self.cxx.link_flags += ['-lc++fs'] if self.link_shared: self.cxx.link_flags += ['-lc++'] else: diff --git a/libcxx/utils/libcxx/test/target_info.py b/libcxx/utils/libcxx/test/target_info.py index 2ea24d62ebc..2f2e395b97f 100644 --- a/libcxx/utils/libcxx/test/target_info.py +++ b/libcxx/utils/libcxx/test/target_info.py @@ -234,18 +234,13 @@ class LinuxLocalTI(DefaultTargetInfo): self.full_config.config.available_features) llvm_unwinder = self.full_config.get_lit_bool('llvm_unwinder', False) shared_libcxx = self.full_config.get_lit_bool('enable_shared', True) - # FIXME: Remove the need to link -lrt in all the tests, and instead - # limit it only to the filesystem tests. This ensures we don't cause an - # implicit dependency on librt except when filesystem is needed. - enable_fs = self.full_config.get_lit_bool('enable_filesystem', - default=False) flags += ['-lm'] if not llvm_unwinder: flags += ['-lgcc_s', '-lgcc'] if enable_threads: flags += ['-lpthread'] - if not shared_libcxx or enable_fs: - flags += ['-lrt'] + if not shared_libcxx: + flags += ['-lrt'] flags += ['-lc'] if llvm_unwinder: flags += ['-lunwind', '-ldl'] |
