summaryrefslogtreecommitdiffstats
path: root/base/process/memory_unittest.cc
diff options
context:
space:
mode:
authorhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 08:29:05 +0000
committerhashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 08:29:05 +0000
commitff2271496f2b0014a162b826ccc5af0d77191c2e (patch)
tree3dbb290df93978588e79b0157a9816e8d2b9e7d1 /base/process/memory_unittest.cc
parent43d68be7dfb3cfff9647d873f9232a2c9f2325c3 (diff)
downloadchromium_src-ff2271496f2b0014a162b826ccc5af0d77191c2e.zip
chromium_src-ff2271496f2b0014a162b826ccc5af0d77191c2e.tar.gz
chromium_src-ff2271496f2b0014a162b826ccc5af0d77191c2e.tar.bz2
Revert 238913 "Make gtest always use simple internal regex engine."
Breaking base_unittests on a number of bots: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20%28dbg%29%283%29/builds/44666 http://build.chromium.org/p/chromium.linux/builders/Linux%20Clang%20%28dbg%29/builds/54034 http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/27229 http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%281%29/builds/21675 http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%2064%20Tests%20%281%29/builds/216 > Make gtest always use simple internal regex engine. > > In order to allow regex matches in gtest to be shared between Windows and other > systems, we tell gtest to always use it's internal engine. > > The syntax supported by the internal engine initially looks like a subset of > POSIX regexs. However character class shortcuts are not valid POSIX. > > Even more confusingly the system POSIX regex function often defines extra > features not actually part of the standard allowing regex that work on Linux > fail on Mac OS X. > > A search through the code base did not reveal any locations where features not > supported by the internal regex engine where used. > > See bug https://code.google.com/p/chromium/issues/detail?id=317224 for more detailed description. > > BUG=317224 > > Review URL: https://codereview.chromium.org/55983002 TBR=mithro@mithis.com Review URL: https://codereview.chromium.org/100313003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process/memory_unittest.cc')
-rw-r--r--base/process/memory_unittest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/base/process/memory_unittest.cc b/base/process/memory_unittest.cc
index 33fcc85..e5c759d 100644
--- a/base/process/memory_unittest.cc
+++ b/base/process/memory_unittest.cc
@@ -121,7 +121,9 @@ TEST(ProcessMemoryTest, MacMallocFailureDoesNotTerminate) {
buf = malloc(std::numeric_limits<size_t>::max() - (2 * PAGE_SIZE) - 1);
},
testing::KilledBySignal(SIGTRAP),
- "\\*\\*\\* error: can't allocate region.*\\n?.*");
+ "\\*\\*\\* error: can't allocate region.*"
+ "(Terminating process due to a potential for future heap "
+ "corruption){0}");
base::debug::Alias(buf);
}
@@ -141,8 +143,8 @@ TEST(ProcessMemoryTest, MacTerminateOnHeapCorruption) {
ASSERT_DEATH(free(buf), "attempting free on address which "
"was not malloc\\(\\)-ed");
#else
- ASSERT_DEATH(free(buf), "being freed.*\\n?\\.*"
- "\\*\\*\\* set a breakpoint in malloc_error_break to debug.*\\n?.*"
+ ASSERT_DEATH(free(buf), "being freed.*"
+ "\\*\\*\\* set a breakpoint in malloc_error_break to debug.*"
"Terminating process due to a potential for future heap corruption");
#endif // ARCH_CPU_64_BITS || defined(ADDRESS_SANITIZER)
}