diff options
author | OCHyams <orlando.hyams@sony.com> | 2022-02-09 17:08:43 +0000 |
---|---|---|
committer | OCHyams <orlando.hyams@sony.com> | 2022-02-10 10:48:03 +0000 |
commit | ac0f32970d2cd0bc263c29b7af16199d350e2c0a (patch) | |
tree | 764d73f0bba0b9259f2342cea0b2386421ddde27 /cross-project-tests | |
parent | 2937b282188bafb6bdb65ee87c70e9109aa910b7 (diff) | |
download | llvm-ac0f32970d2cd0bc263c29b7af16199d350e2c0a.tar.gz |
[cross-project-tests] Add REQUIRES: compiler-rt to tests that use asan
And XFAIL debuginfo-tests/llgdb-tests/asan-deque.cpp on !system-darwin.
On non-darwin systems these tests use gdb and this one fails because gdb
doesn't pretty-print std::deque (the elements of the deque are not printed so
the CHECK lines fail).
Differential Revision: https://reviews.llvm.org/D118760
Diffstat (limited to 'cross-project-tests')
8 files changed, 16 insertions, 12 deletions
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp index 373187fd26cc..60f505ae582b 100644 --- a/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp +++ b/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp @@ -1,4 +1,4 @@ -// REQUIRES: !asan, lldb +// REQUIRES: !asan, compiler-rt, lldb // UNSUPPORTED: system-windows // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/asan.c b/cross-project-tests/debuginfo-tests/dexter-tests/asan.c index 202f125af9b1..52253503729a 100644 --- a/cross-project-tests/debuginfo-tests/dexter-tests/asan.c +++ b/cross-project-tests/debuginfo-tests/dexter-tests/asan.c @@ -1,4 +1,4 @@ -// REQUIRES: !asan, lldb +// REQUIRES: !asan, compiler-rt, lldb // UNSUPPORTED: system-windows // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp index cccdaa1accbd..f618fbad1873 100644 --- a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp +++ b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp @@ -2,7 +2,7 @@ // This ensures that DW_OP_deref is inserted when necessary, such as when // NRVO of a string object occurs in C++. // -// REQUIRES: !asan, lldb +// REQUIRES: !asan, compiler-rt, lldb // UNSUPPORTED: system-windows // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. diff --git a/cross-project-tests/debuginfo-tests/llgdb-tests/asan-blocks.c b/cross-project-tests/debuginfo-tests/llgdb-tests/asan-blocks.c index e7536c733109..e836b32a955b 100644 --- a/cross-project-tests/debuginfo-tests/llgdb-tests/asan-blocks.c +++ b/cross-project-tests/debuginfo-tests/llgdb-tests/asan-blocks.c @@ -1,7 +1,7 @@ // RUN: %clang -fblocks %target_itanium_abi_host_triple -arch x86_64 %s -o %t.out -g -fsanitize=address // RUN: %test_debuginfo %s %t.out // FIXME: Remove system-darwin when we build BlocksRuntime everywhere. -// REQUIRES: !asan, system-darwin +// REQUIRES: !asan, compiler-rt, system-darwin // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. // XFAIL: !system-darwin && gdb-clang-incompatibility diff --git a/cross-project-tests/debuginfo-tests/llgdb-tests/asan-deque.cpp b/cross-project-tests/debuginfo-tests/llgdb-tests/asan-deque.cpp index 00fdf4cc440b..b9ac3e8f9507 100644 --- a/cross-project-tests/debuginfo-tests/llgdb-tests/asan-deque.cpp +++ b/cross-project-tests/debuginfo-tests/llgdb-tests/asan-deque.cpp @@ -1,10 +1,11 @@ // RUN: %clangxx -arch x86_64 %target_itanium_abi_host_triple -O1 -g %s -o %t.out -fsanitize=address // RUN: %test_debuginfo %s %t.out -// REQUIRES: !asan +// REQUIRES: !asan, compiler-rt // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. // UNSUPPORTED: apple-lldb-pre-1000 -// XFAIL: !system-darwin && gdb-clang-incompatibility +// gdb is used on non-darwin systems and it doesn't pretty-print std::deque. +// XFAIL: !system-darwin, (!system-darwin && gdb-clang-incompatibility) #include <deque> @@ -25,24 +26,24 @@ int main() { log.push_back(1234); log.push_back(56789); escape(log); - // DEBUGGER: break 27 + // DEBUGGER: break 28 while (!log.empty()) { auto record = log.front(); log.pop_front(); escape(log); - // DEBUGGER: break 32 + // DEBUGGER: break 33 } } // DEBUGGER: r -// (at line 27) +// (at line 28) // DEBUGGER: p log // CHECK: 1234 // CHECK: 56789 // DEBUGGER: c -// (at line 32) +// (at line 33) // DEBUGGER: p log // CHECK: 56789 diff --git a/cross-project-tests/debuginfo-tests/llgdb-tests/asan.c b/cross-project-tests/debuginfo-tests/llgdb-tests/asan.c index 3e9d601f5e96..e0bfa7bfb913 100644 --- a/cross-project-tests/debuginfo-tests/llgdb-tests/asan.c +++ b/cross-project-tests/debuginfo-tests/llgdb-tests/asan.c @@ -1,6 +1,6 @@ // RUN: %clang -fblocks %target_itanium_abi_host_triple -arch x86_64 %s -o %t.out -g -fsanitize=address // RUN: %test_debuginfo %s %t.out -// REQUIRES: !asan +// REQUIRES: !asan, compiler-rt // Zorg configures the ASAN stage2 bots to not build the asan // compiler-rt. Only run this test on non-asanified configurations. // XFAIL: !system-darwin && gdb-clang-incompatibility diff --git a/cross-project-tests/debuginfo-tests/llgdb-tests/safestack.c b/cross-project-tests/debuginfo-tests/llgdb-tests/safestack.c index 38636a5b8843..b2feab56de81 100644 --- a/cross-project-tests/debuginfo-tests/llgdb-tests/safestack.c +++ b/cross-project-tests/debuginfo-tests/llgdb-tests/safestack.c @@ -1,7 +1,7 @@ // RUN: %clang %target_itanium_abi_host_triple -arch x86_64 %s -o %t.out -g -fsanitize=safe-stack // RUN: %test_debuginfo %s %t.out // UNSUPPORTED: system-darwin -// REQUIRES: !asan +// REQUIRES: !asan, compiler-rt // Zorg configures the ASAN stage2 bots to not build the // safestack compiler-rt. Only run this test on // non-asanified configurations. diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py index ffa208ffc3b9..ae4b7c20651f 100644 --- a/cross-project-tests/lit.cfg.py +++ b/cross-project-tests/lit.cfg.py @@ -78,6 +78,9 @@ if not hasattr(config, 'lld_src_dir'): config.lld_src_dir = "" llvm_config.use_lld(required=('lld' in config.llvm_enabled_projects)) +if 'compiler-rt' in config.llvm_enabled_projects: + config.available_features.add('compiler-rt') + if config.llvm_use_sanitizer: # Propagate path to symbolizer for ASan/MSan. llvm_config.with_system_environment( |