Author: Xing Xue Date: 2022-06-02T09:03:10-04:00 New Revision: dfaee3c9cfa17fce6af317ddcae89c6f6550cf94
URL: https://github.com/llvm/llvm-project/commit/dfaee3c9cfa17fce6af317ddcae89c6f6550cf94 DIFF: https://github.com/llvm/llvm-project/commit/dfaee3c9cfa17fce6af317ddcae89c6f6550cf94.diff LOG: [libunwind][ci][AIX] Add libunwind to buildbot CI Summary: This patch changes scripts to add libunwind CI on AIX. Test config file ibm-libunwind-shared.cfg.in is introduced for testing on AIX. Reviewed by: ldionne, MaskRay, libunwind, ibc++abi Differential Revision: https://reviews.llvm.org/D126017 Added: libunwind/test/configs/ibm-libunwind-shared.cfg.in Modified: libcxx/cmake/caches/AIX.cmake libcxx/utils/ci/run-buildbot Removed: ################################################################################ diff --git a/libcxx/cmake/caches/AIX.cmake b/libcxx/cmake/caches/AIX.cmake index 029b8deae3d7..fcd4ec25ec20 100644 --- a/libcxx/cmake/caches/AIX.cmake +++ b/libcxx/cmake/caches/AIX.cmake @@ -14,3 +14,6 @@ set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "") set(LIBCXXABI_ENABLE_SHARED ON CACHE BOOL "") set(LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "") set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "") +set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "") +set(LIBUNWIND_ENABLE_SHARED ON CACHE BOOL "") +set(LIBUNWIND_ENABLE_STATIC OFF CACHE BOOL "") diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index 2b9f129fd258..2213a3a46d3f 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -575,10 +575,8 @@ aix) generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AIX.cmake" \ -DLIBCXX_TEST_CONFIG="ibm-libc++-shared.cfg.in" \ -DLIBCXXABI_TEST_CONFIG="ibm-libc++abi-shared.cfg.in" \ - -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" - # TODO: use check-runtimes once libunwind builds cleanly on AIX. - ${NINJA} -vC "${BUILD_DIR}" install-cxx install-cxxabi - ${NINJA} -vC "${BUILD_DIR}" check-cxx check-cxxabi + -DLIBUNWIND_TEST_CONFIG="ibm-libunwind-shared.cfg.in" + check-runtimes ;; ################################################################# # Insert vendor-specific internal configurations below. diff --git a/libunwind/test/configs/ibm-libunwind-shared.cfg.in b/libunwind/test/configs/ibm-libunwind-shared.cfg.in new file mode 100644 index 000000000000..c3c0ddd5c726 --- /dev/null +++ b/libunwind/test/configs/ibm-libunwind-shared.cfg.in @@ -0,0 +1,25 @@ +# Configuration file for running the libunwind tests on AIX. +# + +lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') + +config.substitutions.append(('%{flags}', '')) +config.substitutions.append(('%{compile_flags}', + '-nostdinc++ -I %{include} -I %{cxx-include}' +)) +config.substitutions.append(('%{link_flags}', + '-nostdlib++ -L %{lib} -lunwind -ldl -Wl,-bbigtoc' +)) +config.substitutions.append(('%{exec}', + '%{executor} --execdir %T --env LIBPATH=%{lib} -- ' +)) + +import os, site +site.addsitedir(os.path.join('@LIBUNWIND_LIBCXX_PATH@', 'utils')) +import libcxx.test.params, libcxx.test.newconfig, libcxx.test.newconfig +libcxx.test.newconfig.configure( + libcxx.test.params.DEFAULT_PARAMETERS, + libcxx.test.features.DEFAULT_FEATURES, + config, + lit_config +) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits