[libcxx-commits] [libcxx] 875ff8e - [libc++] Enable tests for the experimental library by default

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-06-02T18:39:27-04:00
New Revision: 875ff8e059b73f65f5ad08d416a0a9caf0673d1a

URL: https://github.com/llvm/llvm-project/commit/875ff8e059b73f65f5ad08d416a0a9caf0673d1a
DIFF: https://github.com/llvm/llvm-project/commit/875ff8e059b73f65f5ad08d416a0a9caf0673d1a.diff

LOG: [libc++] Enable tests for the experimental library by default

This matches the fact that we build the experimental library by default.
Otherwise, by default we'd be building the library but not testing it,
which is inconsistent.

Differential Revision: https://reviews.llvm.org/D102109

Added: 
    

Modified: 
    libcxx/test/configs/libcxx-trunk-static.cfg.in
    libcxx/utils/libcxx/test/params.py
    libcxxabi/test/lit.site.cfg.in
    libunwind/test/lit.site.cfg.in

Removed: 
    


################################################################################
diff  --git a/libcxx/test/configs/libcxx-trunk-static.cfg.in b/libcxx/test/configs/libcxx-trunk-static.cfg.in
index 419ed84c8e609..4a6b4f19ec458 100644
--- a/libcxx/test/configs/libcxx-trunk-static.cfg.in
+++ b/libcxx/test/configs/libcxx-trunk-static.cfg.in
@@ -38,9 +38,8 @@ config.substitutions.append(('%{compile_flags}',
         os.path.join(LIBCXX_ROOT, 'test', 'support'))
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib++ {} {} -pthread'.format(
-        os.path.join(INSTALL_ROOT, 'lib', 'libc++.a'),
-        os.path.join(INSTALL_ROOT, 'lib', 'libc++abi.a'))
+    '-nostdlib++ -L {} -lc++ -lc++abi -pthread'.format(
+        os.path.join(INSTALL_ROOT, 'lib'))
 ))
 config.substitutions.append(('%{exec}',
     '{} {} --execdir %T -- '.format(

diff  --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index 068bfcef2df57..d2a7309dc47f4 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -135,7 +135,7 @@ def getStdFlag(cfg, std):
             ])),
 
   # Parameters to enable or disable parts of the test suite
-  Parameter(name='enable_experimental', choices=[True, False], type=bool, default=False,
+  Parameter(name='enable_experimental', choices=[True, False], type=bool, default=True,
             help="Whether to enable tests for experimental C++ libraries (typically Library Fundamentals TSes).",
             actions=lambda experimental: [] if not experimental else [
               AddFeature('c++experimental'),

diff  --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in
index 3445725fc090d..425b9f2c47618 100644
--- a/libcxxabi/test/lit.site.cfg.in
+++ b/libcxxabi/test/lit.site.cfg.in
@@ -30,6 +30,7 @@ if "@TARGET_TRIPLE@":
 config.sysroot                  = "@LIBCXXABI_SYSROOT@"
 config.gcc_toolchain            = "@LIBCXXABI_GCC_TOOLCHAIN@"
 config.cxx_ext_threads          = @LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@
+config.enable_experimental      = False
 
 config.pstl_src_root            = "@ParallelSTL_SOURCE_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None
 config.pstl_obj_root            = "@ParallelSTL_BINARY_DIR@" if @LIBCXX_ENABLE_PARALLEL_ALGORITHMS@ else None

diff  --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index 14fabce48641f..51b46316e4bd4 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -29,6 +29,7 @@ if "@TARGET_TRIPLE@":
 config.sysroot                  = "@LIBUNWIND_SYSROOT@"
 config.gcc_toolchain            = "@LIBUNWIND_GCC_TOOLCHAIN@"
 config.cxx_ext_threads          = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@
+config.enable_experimental      = False
 
 site.addsitedir(os.path.join(config.libunwind_src_root, 'test'))
 site.addsitedir(os.path.join(config.libcxx_src_root, 'utils'))