Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libc++abi] Use from-scratch testing configs for libc++abi by default
Like we have been doing for libc++ for a while now, start using from-scratch testing configurations for libc++abi. As a fly-by fix, remove the LIBCXXABI_NO_TIMER macro, which was defined but never used. Differential Revision: https://reviews.llvm.org/D125242
- Loading branch information
Showing
21 changed files
with
223 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using either a DLL or a static library, with MinGW/Clang on Windows. | ||
|
||
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} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-nostdlib++ -L %{lib} -lc++ -lc++abi' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T --env PATH=%{lib} -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
25 changes: 25 additions & 0 deletions
25
libcxxabi/test/configs/llvm-libc++abi-shared-clangcl.cfg.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using a DLL, with Clang-cl on Windows. | ||
|
||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') | ||
|
||
config.substitutions.append(('%{flags}', '--driver-mode=g++')) | ||
config.substitutions.append(('%{compile_flags}', | ||
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-nostdlib -L %{lib} -lc++ -lc++abi -lmsvcrt -lmsvcprt -loldnames' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T --env PATH=%{lib} -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using a shared library, with GCC. This is done differently from Clang because | ||
# GCC does not support the -nostdlib++ command-line flag. | ||
|
||
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} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-L %{lib} -Wl,-rpath,%{lib} -nodefaultlibs -lc++ -lc++abi -lm -lgcc_s -lgcc -lpthread -lc -lgcc_s -lgcc -latomic' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using a shared library. | ||
|
||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') | ||
|
||
config.substitutions.append(('%{flags}', | ||
'-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else '' | ||
)) | ||
config.substitutions.append(('%{compile_flags}', | ||
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-nostdlib++ -L %{lib} -Wl,-rpath,%{lib} -lc++ -lc++abi -pthread' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
25 changes: 25 additions & 0 deletions
25
libcxxabi/test/configs/llvm-libc++abi-static-clangcl.cfg.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using a static library, with Clang-cl on Windows. | ||
|
||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') | ||
|
||
config.substitutions.append(('%{flags}', '--driver-mode=g++')) | ||
config.substitutions.append(('%{compile_flags}', | ||
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-nostdlib -L %{lib} -llibc++ -llibc++abi -lmsvcrt -lmsvcprt -loldnames' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T --env PATH=%{lib} -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# This testing configuration handles running the test suite against LLVM's libc++abi | ||
# using a static library. | ||
|
||
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') | ||
|
||
config.substitutions.append(('%{flags}', | ||
'-isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else '' | ||
)) | ||
config.substitutions.append(('%{compile_flags}', | ||
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS' | ||
)) | ||
config.substitutions.append(('%{link_flags}', | ||
'-nostdlib++ -L %{lib} -lc++ -lc++abi -pthread' | ||
)) | ||
config.substitutions.append(('%{exec}', | ||
'%{executor} --execdir %T -- ' | ||
)) | ||
|
||
import os, site | ||
site.addsitedir(os.path.join('@LIBCXXABI_LIBCXX_PATH@', 'utils')) | ||
import libcxx.test.params, libcxx.test.newconfig | ||
libcxx.test.newconfig.configure( | ||
libcxx.test.params.DEFAULT_PARAMETERS, | ||
libcxx.test.features.DEFAULT_FEATURES, | ||
config, | ||
lit_config | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.