This is an archive of the discontinued LLVM Phabricator instance.

Differential D125981

[libunwind] Introduce a cmake-bridge.cfg.in file to reduce test config duplication
ClosedPublic

Authored by ldionne on May 19 2022, 8:16 AM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Restricted Project
Commits
rG422ec524388b: [libunwind] Introduce a cmake-bridge.cfg.in file to reduce test config…

Diff Detail

Unit TestsFailed

TimeTest
130 mslibcxx CI AArch64 -fno-exceptions > libc++abi.native/AArch64::ra_sign_state.pass.cpp

Event Timeline

ldionne created this revision.May 19 2022, 8:16 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMay 19 2022, 8:16 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, mgorny. · View Herald Transcript
ldionne requested review of this revision.May 19 2022, 8:16 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 19 2022, 8:16 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B165338: Diff 430693.May 19 2022, 10:50 AM
ldionne accepted this revision as: Restricted Project, Restricted Project.May 20 2022, 6:36 AM

The only CI failure is a nit I just fixed, so shipping this.

This revision was not accepted when it landed; it landed in state Needs Review.May 20 2022, 6:36 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG422ec524388b: [libunwind] Introduce a cmake-bridge.cfg.in file to reduce test config… (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG422ec524388b: [libunwind] Introduce a cmake-bridge.cfg.in file to reduce test config….
xingxue mentioned this in D126017: [libunwind][ci][AIX] Add libunwind to buildbot CI.May 20 2022, 9:16 AM

Revision Contents

PathSize
libcxx/
test/
configs/
3 lines
libunwind/
test/
4 lines
configs/
37 lines
30 lines
34 lines
38 lines

Diff 430693

libcxx/test/configs/cmake-bridge.cfg.in

@AUTO_GEN_COMMENT@ @AUTO_GEN_COMMENT@
@SERIALIZED_LIT_PARAMS@ @SERIALIZED_LIT_PARAMS@
import shlex
# #
# This file performs the bridge between the CMake configuration and the Lit # This file performs the bridge between the CMake configuration and the Lit
# configuration files by setting up the LitConfig object and various Lit # configuration files by setting up the LitConfig object and various Lit
# substitutions from CMake variables. # substitutions from CMake variables.
# #
# Individual configuration files can take advantage of this bridge by # Individual configuration files can take advantage of this bridge by
# loading the file and then setting up the remaining Lit substitutions. # loading the file and then setting up the remaining Lit substitutions.
# #
import os, site import os, site
site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils')) site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils'))
import libcxx.test.format import libcxx.test.format
# Basic configuration of the test suite # Basic configuration of the test suite
config.name = os.path.basename('@LIBCXX_TEST_CONFIG@') config.name = os.path.basename('@LIBCXX_TEST_CONFIG@')
config.test_source_root = os.path.join('@LIBCXX_SOURCE_DIR@', 'test') config.test_source_root = os.path.join('@LIBCXX_SOURCE_DIR@', 'test')
config.test_format = libcxx.test.format.CxxStandardLibraryTest() config.test_format = libcxx.test.format.CxxStandardLibraryTest()
config.recursiveExpansionLimit = 10 config.recursiveExpansionLimit = 10
config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test') config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test')
# Add substitutions for bootstrapping the test suite configuration # Add substitutions for bootstrapping the test suite configuration
import shlex
config.substitutions.append(('%{cxx}', shlex.quote('@CMAKE_CXX_COMPILER@'))) config.substitutions.append(('%{cxx}', shlex.quote('@CMAKE_CXX_COMPILER@')))
config.substitutions.append(('%{libcxx}', '@LIBCXX_SOURCE_DIR@')) config.substitutions.append(('%{libcxx}', '@LIBCXX_SOURCE_DIR@'))
config.substitutions.append(('%{include}', '@LIBCXX_GENERATED_INCLUDE_DIR@')) config.substitutions.append(('%{include}', '@LIBCXX_GENERATED_INCLUDE_DIR@'))
config.substitutions.append(('%{target-include}', '@LIBCXX_GENERATED_INCLUDE_TARGET_DIR@')) config.substitutions.append(('%{target-include}', '@LIBCXX_GENERATED_INCLUDE_TARGET_DIR@'))
config.substitutions.append(('%{lib}', '@LIBCXX_LIBRARY_DIR@')) config.substitutions.append(('%{lib}', '@LIBCXX_LIBRARY_DIR@'))
config.substitutions.append(('%{executor}', '@LIBCXX_EXECUTOR@')) config.substitutions.append(('%{executor}', '@LIBCXX_EXECUTOR@'))

libunwind/test/CMakeLists.txt

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
endif() endif()
foreach(param IN LISTS LIBUNWIND_TEST_PARAMS) foreach(param IN LISTS LIBUNWIND_TEST_PARAMS)
string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}") string(REGEX REPLACE "(.+)=(.+)" "\\1" name "${param}")
string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}") string(REGEX REPLACE "(.+)=(.+)" "\\2" value "${param}")
serialize_lit_param("${name}" "\"${value}\"") serialize_lit_param("${name}" "\"${value}\"")
endforeach() endforeach()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/configs/cmake-bridge.cfg.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake-bridge.cfg"
@ONLY)
configure_lit_site_cfg( configure_lit_site_cfg(
"${LIBUNWIND_TEST_CONFIG}" "${LIBUNWIND_TEST_CONFIG}"
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
MAIN_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py") MAIN_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py")
add_lit_testsuite(check-unwind "Running libunwind tests" add_lit_testsuite(check-unwind "Running libunwind tests"
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS unwind ${LIBUNWIND_TEST_DEPS}) DEPENDS unwind ${LIBUNWIND_TEST_DEPS})

libunwind/test/configs/cmake-bridge.cfg.in

  • This file was added.
@AUTO_GEN_COMMENT@
@SERIALIZED_LIT_PARAMS@
#
# This file performs the bridge between the CMake configuration and the Lit
# configuration files by setting up the LitConfig object and various Lit
# substitutions from CMake variables.
#
# Individual configuration files can take advantage of this bridge by
# loading the file and then setting up the remaining Lit substitutions.
#
import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.format
# Basic configuration of the test suite
config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
config.test_format = libcxx.test.format.CxxStandardLibraryTest()
config.recursiveExpansionLimit = 10
config.test_exec_root = '@CMAKE_BINARY_DIR@'
config.target_info = "@LIBUNWIND_TARGET_INFO@"
# Add a few features that are common to all the configurations
if @LIBUNWIND_USES_ARM_EHABI@:
config.available_features.add('libunwind-arm-ehabi')
if not @LIBUNWIND_ENABLE_THREADS@:
config.available_features.add('libunwind-no-threads')
# Add substitutions for bootstrapping the test suite configuration
import shlex
config.substitutions.append(('%{cxx}', shlex.quote('@CMAKE_CXX_COMPILER@')))
config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
config.substitutions.append(('%{include}', '@LIBUNWIND_SOURCE_DIR@/include'))
config.substitutions.append(('%{lib}', '@LIBUNWIND_LIBRARY_DIR@'))

libunwind/test/configs/llvm-libunwind-merged.cfg.in

@AUTO_GEN_COMMENT@
@SERIALIZED_LIT_PARAMS@
# #
# Configuration file for running the libunwind tests against a libc++ shared library # Configuration file for running the libunwind tests against a libc++ shared library
# into which the unwinder was merged. # into which the unwinder was merged.
# #
import os, site lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.format
# Basic configuration of the test suite
config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
config.test_format = libcxx.test.format.CxxStandardLibraryTest()
config.recursiveExpansionLimit = 10
config.test_exec_root = '@CMAKE_BINARY_DIR@'
config.target_info = "@LIBUNWIND_TARGET_INFO@"
compile_flags = [] compile_flags = []
link_flags = [] link_flags = []
if @LIBUNWIND_USES_ARM_EHABI@:
config.available_features.add('libunwind-arm-ehabi')
if not @LIBUNWIND_ENABLE_THREADS@:
config.available_features.add('libunwind-no-threads')
if @LIBUNWIND_ENABLE_CET@: if @LIBUNWIND_ENABLE_CET@:
compile_flags.append('-fcf-protection=full') compile_flags.append('-fcf-protection=full')
if '@CMAKE_SYSTEM_NAME@' == 'Linux': if '@CMAKE_SYSTEM_NAME@' == 'Linux':
link_flags.append('-Wl,--export-dynamic') link_flags.append('-Wl,--export-dynamic')
# Stack unwinding tests need unwinding tables and these are not generated by default on all targets. # Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
compile_flags.append('-funwind-tables') compile_flags.append('-funwind-tables')
config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@' local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@'
config.substitutions.append(('%{flags}', config.substitutions.append(('%{flags}',
'-isysroot {}'.format(local_sysroot) if local_sysroot else '' '-isysroot {}'.format(local_sysroot) if local_sysroot else ''
)) ))
config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags)) '-nostdinc++ -I %{{include}} {}'.format(' '.join(compile_flags))
)) ))
config.substitutions.append(('%{link_flags}', config.substitutions.append(('%{link_flags}',
'-L {0} -Wl,-rpath,{0} -lc++ -ldl {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags)) '-L %{{lib}} -Wl,-rpath,%{{lib}} -lc++ -ldl {}'.format(' '.join(link_flags))
)) ))
config.substitutions.append(('%{exec}', config.substitutions.append(('%{exec}',
'%{executor} --execdir %T -- ' if '@LIBUNWIND_EXECUTOR@' else '' '%{executor} --execdir %T -- '
)) ))
import os, site import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
libcxx.test.newconfig.configure( libcxx.test.newconfig.configure(
libcxx.test.params.DEFAULT_PARAMETERS, libcxx.test.params.DEFAULT_PARAMETERS,
libcxx.test.features.DEFAULT_FEATURES, libcxx.test.features.DEFAULT_FEATURES,
config, config,
lit_config lit_config
) )

libunwind/test/configs/llvm-libunwind-shared.cfg.in

@AUTO_GEN_COMMENT@
@SERIALIZED_LIT_PARAMS@
# #
# Configuration file for running the libunwind tests against the shared library. # Configuration file for running the libunwind tests against the shared library.
# #
# This file is a lot simpler than the ones for libc++ and libc++abi because
# while libunwind is written in C++, it doesn't use the C++ Standard Library
# so we don't need to set that up to run the tests correctly.
#
import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.format
# Basic configuration of the test suite lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
config.test_format = libcxx.test.format.CxxStandardLibraryTest()
config.recursiveExpansionLimit = 10
config.test_exec_root = '@CMAKE_BINARY_DIR@'
config.target_info = "@LIBUNWIND_TARGET_INFO@"
compile_flags = [] compile_flags = []
link_flags = [] link_flags = []
if @LIBUNWIND_USES_ARM_EHABI@:
config.available_features.add('libunwind-arm-ehabi')
if not @LIBUNWIND_ENABLE_THREADS@:
config.available_features.add('libunwind-no-threads')
if @LIBUNWIND_ENABLE_CET@: if @LIBUNWIND_ENABLE_CET@:
compile_flags.append('-fcf-protection=full') compile_flags.append('-fcf-protection=full')
if '@CMAKE_SYSTEM_NAME@' == 'Linux': if '@CMAKE_SYSTEM_NAME@' == 'Linux':
link_flags.append('-Wl,--export-dynamic') link_flags.append('-Wl,--export-dynamic')
# Stack unwinding tests need unwinding tables and these are not generated by default on all targets. # Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
compile_flags.append('-funwind-tables') compile_flags.append('-funwind-tables')
config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@' local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@'
config.substitutions.append(('%{flags}', config.substitutions.append(('%{flags}',
'-isysroot {}'.format(local_sysroot) if local_sysroot else '' '-isysroot {}'.format(local_sysroot) if local_sysroot else ''
)) ))
config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags)) '-nostdinc++ -I %{{include}} {}'.format(' '.join(compile_flags))
)) ))
config.substitutions.append(('%{link_flags}', config.substitutions.append(('%{link_flags}',
'-L {0} -Wl,-rpath,{0} -lunwind -ldl {1}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags)) '-L %{{lib}} -Wl,-rpath,%{{lib}} -lunwind -ldl {}'.format(' '.join(link_flags))
)) ))
config.substitutions.append(('%{exec}', config.substitutions.append(('%{exec}',
'%{executor} --execdir %T -- ' if '@LIBUNWIND_EXECUTOR@' else '' '%{executor} --execdir %T -- '
)) ))
import os, site import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
libcxx.test.newconfig.configure( libcxx.test.newconfig.configure(
libcxx.test.params.DEFAULT_PARAMETERS, libcxx.test.params.DEFAULT_PARAMETERS,
libcxx.test.features.DEFAULT_FEATURES, libcxx.test.features.DEFAULT_FEATURES,
config, config,
lit_config lit_config
) )

libunwind/test/configs/llvm-libunwind-static.cfg.in

@AUTO_GEN_COMMENT@
@SERIALIZED_LIT_PARAMS@
# #
# Configuration file for running the libunwind tests against the static library. # Configuration file for running the libunwind tests against the static library.
# #
# This file is a lot simpler than the ones for libc++ and libc++abi because
# while libunwind is written in C++, it doesn't use the C++ Standard Library
# so we don't need to set that up to run the tests correctly.
#
import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.format
# Basic configuration of the test suite lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
config.test_format = libcxx.test.format.CxxStandardLibraryTest()
config.recursiveExpansionLimit = 10
config.test_exec_root = '@CMAKE_BINARY_DIR@'
config.target_info = "@LIBUNWIND_TARGET_INFO@"
compile_flags = [] compile_flags = []
link_flags = [] link_flags = []
if @LIBUNWIND_USES_ARM_EHABI@: if @LIBUNWIND_ENABLE_THREADS@:
config.available_features.add('libunwind-arm-ehabi')
if not @LIBUNWIND_ENABLE_THREADS@:
config.available_features.add('libunwind-no-threads')
else:
link_flags.append('-lpthread') link_flags.append('-lpthread')
if @LIBUNWIND_ENABLE_CET@: if @LIBUNWIND_ENABLE_CET@:
compile_flags.append('-fcf-protection=full') compile_flags.append('-fcf-protection=full')
if '@CMAKE_SYSTEM_NAME@' == 'Linux': if '@CMAKE_SYSTEM_NAME@' == 'Linux':
link_flags.append('-Wl,--export-dynamic') link_flags.append('-Wl,--export-dynamic')
# Stack unwinding tests need unwinding tables and these are not generated by default on all targets. # Stack unwinding tests need unwinding tables and these are not generated by default on all targets.
compile_flags.append('-funwind-tables') compile_flags.append('-funwind-tables')
config.substitutions.append(('%{executor}', '@LIBUNWIND_EXECUTOR@'))
config.substitutions.append(('%{cxx}', '@CMAKE_CXX_COMPILER@'))
local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@' local_sysroot = '@CMAKE_OSX_SYSROOT@' or '@CMAKE_SYSROOT@'
config.substitutions.append(('%{flags}', config.substitutions.append(('%{flags}',
'-isysroot {}'.format(local_sysroot) if local_sysroot else '' '-isysroot {}'.format(local_sysroot) if local_sysroot else ''
)) ))
config.substitutions.append(('%{compile_flags}', config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I {}/include {}'.format('@LIBUNWIND_SOURCE_DIR@', ' '.join(compile_flags)) '-nostdinc++ -I %{{include}} {}'.format(' '.join(compile_flags))
)) ))
config.substitutions.append(('%{link_flags}', config.substitutions.append(('%{link_flags}',
'{}/libunwind.a -ldl {}'.format('@LIBUNWIND_LIBRARY_DIR@', ' '.join(link_flags)) '%{{lib}}/libunwind.a -ldl {}'.format(' '.join(link_flags))
)) ))
config.substitutions.append(('%{exec}', config.substitutions.append(('%{exec}',
'%{executor} --execdir %T -- ' if '@LIBUNWIND_EXECUTOR@' else '' '%{executor} --execdir %T -- '
)) ))
import os, site import os, site
site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils'))
import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig
libcxx.test.newconfig.configure( libcxx.test.newconfig.configure(
libcxx.test.params.DEFAULT_PARAMETERS, libcxx.test.params.DEFAULT_PARAMETERS,
libcxx.test.features.DEFAULT_FEATURES, libcxx.test.features.DEFAULT_FEATURES,
config, config,
lit_config lit_config
) )