commit f7d368bb1feaef1815b2cb25ff5887fe5beaea99
author Eric Fiselier <eric@efcs.ca> Mon Mar 18 22:12:09 2019 +0000
committer Eric Fiselier <eric@efcs.ca> Mon Mar 18 22:12:09 2019 +0000
tree 81f43654e63934ce38a1d66b7e8bc633bfc5929d
parent eb2e397396e98b74b0684f40d683cf3713bae842

Fix test failures after debug mode changes

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@356421 91177308-0d34-0410-b5e6-96231b3b80d8

test/support/debug_mode_helper.h

diff --git a/test/support/debug_mode_helper.h b/test/support/debug_mode_helper.h
index 6a662d1..ed111ab 100644
--- a/test/support/debug_mode_helper.h
+++ b/test/support/debug_mode_helper.h
@@ -15,7 +15,7 @@
 
 #include <ciso646>
 #ifndef _LIBCPP_VERSION
-#error This header may only be used for libc++ tests"
+#error "This header may only be used for libc++ tests"
 #endif
 
 #include <__debug>
@@ -42,9 +42,9 @@
   static constexpr const char* any_file = "*";
   static constexpr const char* any_msg = "*";
 
-  constexpr DebugInfoMatcher() : is_empty(true), msg(any_msg), file(any_file), line(any_line) { }
+  constexpr DebugInfoMatcher() : is_empty(true), msg(any_msg, __builtin_strlen(any_msg)), file(any_file, __builtin_strlen(any_file)), line(any_line) { }
   constexpr DebugInfoMatcher(const char* msg, const char* file = any_file, int line = any_line)
-    : is_empty(false), msg(msg), file(file), line(line) {}
+    : is_empty(false), msg(msg, __builtin_strlen(msg)), file(file, __builtin_strlen(file)), line(line) {}
 
   bool Matches(std::__libcpp_debug_info const& got) const {
     assert(!empty() && "empty matcher");