[libcxx-commits] [libcxx] 33c9c10 - [libc++abi] Allow specifying custom Lit config files
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Jun 25 09:15:29 PDT 2020
Author: Louis Dionne
Date: 2020-06-25T12:15:15-04:00
New Revision: 33c9c10d183371edc95fa936705bef56f55ab611
URL: https://github.com/llvm/llvm-project/commit/33c9c10d183371edc95fa936705bef56f55ab611
DIFF: https://github.com/llvm/llvm-project/commit/33c9c10d183371edc95fa936705bef56f55ab611.diff
LOG: [libc++abi] Allow specifying custom Lit config files
This is the libc++abi counterpart of 0c66af970c80.
Added:
libcxxabi/test/lit.cfg.py
Modified:
libcxx/CMakeLists.txt
libcxxabi/CMakeLists.txt
libcxxabi/test/CMakeLists.txt
libcxxabi/test/lit.site.cfg.in
Removed:
libcxxabi/test/lit.cfg
################################################################################
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 7d94d728f9eb..75088403f029 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -110,7 +110,7 @@ option(LIBCXX_INCLUDE_TESTS "Build the libc++ tests." ${LLVM_INCLUDE_TESTS})
option(LIBCXX_ENABLE_PARALLEL_ALGORITHMS "Enable the parallel algorithms library. This requires the PSTL to be available." OFF)
option(LIBCXX_TEST_GDB_PRETTY_PRINTERS "Test gdb pretty printers." OFF)
set(LIBCXX_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/lit.site.cfg.in" CACHE STRING
- "The Lit testing configuration to use when running the tests")
+ "The Lit testing configuration to use when running the tests.")
# Benchmark options -----------------------------------------------------------
option(LIBCXX_INCLUDE_BENCHMARKS "Build the libc++ benchmarks and their dependencies" ON)
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
index 08bc8dcee65a..c577036064a2 100644
--- a/libcxxabi/CMakeLists.txt
+++ b/libcxxabi/CMakeLists.txt
@@ -135,6 +135,9 @@ message(STATUS "Libc++abi will be using libc++ includes from ${LIBCXXABI_LIBCXX_
option(LIBCXXABI_HERMETIC_STATIC_LIBRARY
"Do not export any symbols from the static library." OFF)
+set(LIBCXXABI_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/lit.site.cfg.in" CACHE STRING
+ "The Lit testing configuration to use when running the tests.")
+
#===============================================================================
# Configure System
#===============================================================================
diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt
index 2160f52c3350..b942b9c62e5d 100644
--- a/libcxxabi/test/CMakeLists.txt
+++ b/libcxxabi/test/CMakeLists.txt
@@ -53,8 +53,6 @@ set(LIBCXXABI_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
set(LIBCXXABI_EXECUTOR "${Python3_EXECUTABLE} ${LIBCXXABI_LIBCXX_PATH}/utils/run.py" CACHE STRING
"Executor to use when running tests.")
-set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!")
-
if (LIBCXXABI_ENABLE_SHARED)
set(LIBCXXABI_TEST_DEPS cxxabi_shared)
else()
@@ -72,12 +70,12 @@ if (NOT LIBCXXABI_STANDALONE_BUILD)
endif()
endif()
-
+set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!")
configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+ "${LIBCXXABI_TEST_CONFIG}"
+ ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+ MAIN_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py")
add_lit_testsuite(check-cxxabi "Running libcxxabi tests"
${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${LIBCXXABI_TEST_DEPS}
- )
+ DEPENDS ${LIBCXXABI_TEST_DEPS})
diff --git a/libcxxabi/test/lit.cfg b/libcxxabi/test/lit.cfg
deleted file mode 100644
index 4c4aa3b2dd58..000000000000
--- a/libcxxabi/test/lit.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- Python -*- vim: set ft=python ts=4 sw=4 expandtab tw=79:
-
-# Configuration file for the 'lit' test runner.
-
-
-import os
-import site
-
-site.addsitedir(os.path.dirname(__file__))
-
-
-# Tell pylint that we know config and lit_config exist somewhere.
-if 'PYLINT_IMPORT' in os.environ:
- config = object()
- lit_config = object()
-
-# name: The name of this test suite.
-config.name = 'libc++abi'
-
-# suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.cpp', '.s']
-
-# Allow expanding substitutions that are based on other substitutions
-config.recursiveExpansionLimit = 10
-
-# test_source_root: The root path where tests are located.
-config.test_source_root = os.path.dirname(__file__)
-
-# Allow expanding substitutions that are based on other substitutions
-config.recursiveExpansionLimit = 10
-
-# Infer the libcxx_test_source_root for configuration import.
-# If libcxx_source_root isn't specified in the config, assume that the libcxx
-# and libcxxabi source directories are sibling directories.
-libcxx_src_root = getattr(config, 'libcxx_src_root', None)
-if not libcxx_src_root:
- libcxx_src_root = os.path.join(config.test_source_root, '../../libcxx')
-libcxx_test_src_root = os.path.join(libcxx_src_root, 'utils')
-if os.path.isfile(os.path.join(libcxx_test_src_root, 'libcxx', '__init__.py')):
- site.addsitedir(libcxx_test_src_root)
-else:
- lit_config.fatal('Could not find libcxx test directory for test imports'
- ' in: %s' % libcxx_test_src_root)
-
-# Infer the test_exec_root from the libcxx_object root.
-obj_root = getattr(config, 'libcxxabi_obj_root', None)
-
-# Check that the test exec root is known.
-if obj_root is None:
- import libcxx.test.config
- libcxx.test.config.loadSiteConfig(
- lit_config, config, 'libcxxabi_site_config', 'LIBCXXABI_SITE_CONFIG')
- obj_root = getattr(config, 'libcxxabi_obj_root', None)
- if obj_root is None:
- import tempfile
- obj_root = tempfile.mkdtemp(prefix='libcxxabi-testsuite-')
- lit_config.warning('Creating temporary directory for object root: %s' %
- obj_root)
-
-config.test_exec_root = os.path.join(obj_root, 'test')
-
-cfg_variant = getattr(config, 'configuration_variant', 'libcxxabi')
-if cfg_variant:
- lit_config.note('Using configuration variant: %s' % cfg_variant)
-
-# Load the Configuration class from the module name <cfg_variant>.test.config.
-config_module_name = '.'.join([cfg_variant, 'test', 'config'])
-config_module = __import__(config_module_name, fromlist=['Configuration'])
-
-configuration = config_module.Configuration(lit_config, config)
-configuration.configure()
-configuration.print_config_info()
-if lit_config.params.get('use_old_format', False):
- lit_config.note("Using the old libc++ testing format")
- config.test_format = configuration.get_test_format()
-else:
- lit_config.note("Using the new libc++ testing format")
- import libcxx.test.newformat
- config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
diff --git a/libcxxabi/test/lit.cfg.py b/libcxxabi/test/lit.cfg.py
new file mode 100644
index 000000000000..647464abe22d
--- /dev/null
+++ b/libcxxabi/test/lit.cfg.py
@@ -0,0 +1,10 @@
+# All the Lit configuration is handled in the site configs -- this file is only
+# left as a canary to catch invocations of Lit that do not go through llvm-lit.
+#
+# Invocations that go through llvm-lit will automatically use the right Lit
+# site configuration inside the build directory.
+
+lit_config.fatal(
+ "You seem to be running Lit directly -- you should be running Lit through "
+ "<build>/bin/llvm-lit, which will ensure that the right Lit configuration "
+ "file is used.")
diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in
index 69f34daec01d..4c8d42024fc0 100644
--- a/libcxxabi/test/lit.site.cfg.in
+++ b/libcxxabi/test/lit.site.cfg.in
@@ -1,4 +1,8 @@
@AUTO_GEN_COMMENT@
+
+import os
+import site
+
config.cxx_under_test = "@LIBCXXABI_COMPILER@"
config.project_obj_root = "@CMAKE_BINARY_DIR@"
config.libcxxabi_src_root = "@LIBCXXABI_SOURCE_DIR@"
@@ -29,7 +33,36 @@ config.cxx_ext_threads = @LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@
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
+# Code signing
config.llvm_codesign_identity = "@LLVM_CODESIGNING_IDENTITY@"
-# Let the main config do the real work.
-lit_config.load_config(config, "@LIBCXXABI_SOURCE_DIR@/test/lit.cfg")
+site.addsitedir(os.path.join(config.libcxxabi_src_root, 'test'))
+site.addsitedir(os.path.join(config.libcxx_src_root, 'utils'))
+
+# name: The name of this test suite.
+config.name = 'libc++abi'
+
+# suffixes: A list of file extensions to treat as test files.
+config.suffixes = ['.cpp', '.s']
+
+# test_source_root: The root path where tests are located.
+config.test_source_root = os.path.join(config.libcxxabi_src_root, 'test')
+
+# Allow expanding substitutions that are based on other substitutions
+config.recursiveExpansionLimit = 10
+
+# Infer the test_exec_root from the build directory.
+config.test_exec_root = os.path.join(config.libcxxabi_obj_root, 'test')
+
+lit_config.note('Using configuration variant: libcxxabi')
+import libcxxabi.test.config
+configuration = libcxxabi.test.config.Configuration(lit_config, config)
+configuration.configure()
+configuration.print_config_info()
+if lit_config.params.get('use_old_format', False):
+ lit_config.note("Using the old libc++ testing format")
+ config.test_format = configuration.get_test_format()
+else:
+ lit_config.note("Using the new libc++ testing format")
+ import libcxx.test.newformat
+ config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
More information about the libcxx-commits
mailing list