[libcxx-commits] [libcxx] afe40b3 - [libcxx] [test] Mark tests that require specific allocation behaviours as libcpp only
Martin Storsjö via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Oct 19 14:07:35 PDT 2020
Author: Martin Storsjö
Date: 2020-10-20T00:07:01+03:00
New Revision: afe40b305d2292bce5b2694220697c6e6bdeed65
URL: https://github.com/llvm/llvm-project/commit/afe40b305d2292bce5b2694220697c6e6bdeed65
DIFF: https://github.com/llvm/llvm-project/commit/afe40b305d2292bce5b2694220697c6e6bdeed65.diff
LOG: [libcxx] [test] Mark tests that require specific allocation behaviours as libcpp only
This fixes/silences a few failures on libstdc++ on linux.
Differential Revision: https://reviews.llvm.org/D89676
Added:
Modified:
libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
index 93a0925a32ba..5ce2d662f2be 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
@@ -331,8 +331,8 @@ int main(int, char**)
doAppendSourceTest<char32_t>(TC);
}
for (auto const & TC : LongLHSCases) {
- doAppendSourceAllocTest<char>(TC);
- doAppendSourceAllocTest<wchar_t>(TC);
+ LIBCPP_ONLY(doAppendSourceAllocTest<char>(TC));
+ LIBCPP_ONLY(doAppendSourceAllocTest<wchar_t>(TC));
}
test_sfinae();
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
index b3f1eddba491..234ad4be984c 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
@@ -356,7 +356,7 @@ int main(int, char**)
const char* E = TC.expect;
PathReserve(LHS, StrLen(E) + 5);
{
- DisableAllocationGuard g;
+ LIBCPP_ONLY(DisableAllocationGuard g);
path& Ref = (LHS += RHS);
assert(&Ref == &LHS);
}
@@ -368,14 +368,14 @@ int main(int, char**)
const char* E = TC.expect;
PathReserve(LHS, StrLen(E) + 5);
{
- DisableAllocationGuard g;
+ LIBCPP_ONLY(DisableAllocationGuard g);
path& Ref = (LHS += RHS);
assert(&Ref == &LHS);
}
assert(LHS == E);
}
- doConcatSourceAllocTest<char>(TC);
- doConcatSourceAllocTest<wchar_t>(TC);
+ LIBCPP_ONLY(doConcatSourceAllocTest<char>(TC));
+ LIBCPP_ONLY(doConcatSourceAllocTest<wchar_t>(TC));
}
for (auto const& TC : CharTestCases) {
doConcatECharTest<char>(TC);
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
index e1325f034842..091ea3140773 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03
+// REQUIRES: libc++
// <filesystem>
More information about the libcxx-commits
mailing list