summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 20:59:01 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 20:59:01 +0000
commit20960e074cf789825155f771e1c035df41cd0e75 (patch)
tree560b967c07210bda790dbeebf6174e3e971b5eb7 /ipc
parentc4f7571e88637185eb79e598bd3b6301490a2255 (diff)
downloadchromium_src-20960e074cf789825155f771e1c035df41cd0e75.zip
chromium_src-20960e074cf789825155f771e1c035df41cd0e75.tar.gz
chromium_src-20960e074cf789825155f771e1c035df41cd0e75.tar.bz2
Add a gyp flag to enable dcheck by default in release without
having the pass a flag. This will be used on the try bots. BUG=96753 Review URL: http://codereview.chromium.org/7719007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_fuzzing_tests.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc
index c7076cc..d1a3c33 100644
--- a/ipc/ipc_fuzzing_tests.cc
+++ b/ipc/ipc_fuzzing_tests.cc
@@ -290,7 +290,7 @@ TEST_F(IPCFuzzingTest, SanityTest) {
// In debug this triggers an assertion and in release it is ignored(!!). Right
// after we generate another valid IPC to make sure framing is working
// properly.
-#ifdef NDEBUG
+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
TEST_F(IPCFuzzingTest, MsgBadPayloadShort) {
FuzzerClientListener listener;
IPC::Channel chan(kFuzzerChannel, IPC::Channel::MODE_SERVER,
@@ -314,7 +314,7 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadShort) {
EXPECT_TRUE(base::WaitForSingleProcess(server_process, 5000));
base::CloseProcessHandle(server_process);
}
-#endif // NDEBUG
+#endif
// This test uses a payload that has too many arguments, but so the payload
// size is big enough so the unpacking routine does not generate an error as
@@ -392,7 +392,7 @@ TEST_F(IPCFuzzingTest, MsgMapExMacro) {
EXPECT_TRUE(server.OnMessageReceived(*msg));
delete msg;
-#ifdef NDEBUG
+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
// Test a bad message.
msg = new IPC::Message(MSG_ROUTING_CONTROL, MsgClassSI::ID,
IPC::Message::PRIORITY_NORMAL);