Author: ericwf Date: Fri Jun 17 19:23:13 2016 New Revision: 273072 URL: http://llvm.org/viewvc/llvm-project?rev=273072&view=rev Log: Add checkpoints to string allocation test to help with debugging arm failures.
Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp?rev=273072&r1=273071&r2=273072&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.native.obs/string_alloc.pass.cpp Fri Jun 17 19:23:13 2016 @@ -27,6 +27,7 @@ #include "count_new.hpp" #include "min_allocator.h" #include "filesystem_test_helper.hpp" +#include "assert_checkpoint.h" namespace fs = std::experimental::filesystem; @@ -43,8 +44,10 @@ void doShortStringTest(MultiStringType c const path p((const char*)MS); { DisableAllocationGuard g; // should not allocate + CHECKPOINT("short string default constructed allocator"); Str s = p.string<CharT>(); assert(s == value); + CHECKPOINT("short string provided allocator"); Str s2 = p.string<CharT>(Alloc{}); assert(s2 == value); } @@ -59,7 +62,7 @@ void doLongStringTest(MultiStringType co const path p((const char*)MS); { // Default allocator using Alloc = std::allocator<CharT>; - RequireAllocationGuard g; // should not allocate because + RequireAllocationGuard g; Str s = p.string<CharT>(); assert(s == value); Str s2 = p.string<CharT>(Alloc{}); @@ -67,6 +70,7 @@ void doLongStringTest(MultiStringType co } using MAlloc = malloc_allocator<CharT>; MAlloc::reset(); + CHECKPOINT("Malloc allocator test - default construct"); { // Other allocator - default construct using Traits = std::char_traits<CharT>; using AStr = std::basic_string<CharT, Traits, MAlloc>; @@ -77,6 +81,7 @@ void doLongStringTest(MultiStringType co assert(MAlloc::outstanding_alloc() == 1); } MAlloc::reset(); + CHECKPOINT("Malloc allocator test - provided copy"); { // Other allocator - provided copy using Traits = std::char_traits<CharT>; using AStr = std::basic_string<CharT, Traits, MAlloc>; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits