From 20960e074cf789825155f771e1c035df41cd0e75 Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Tue, 20 Sep 2011 20:59:01 +0000 Subject: 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 --- ui/base/text/bytes_formatting_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/base') diff --git a/ui/base/text/bytes_formatting_unittest.cc b/ui/base/text/bytes_formatting_unittest.cc index a214259..4130552 100644 --- a/ui/base/text/bytes_formatting_unittest.cc +++ b/ui/base/text/bytes_formatting_unittest.cc @@ -20,7 +20,7 @@ TEST(BytesFormattingTest, GetByteDisplayUnits) { {10LL*1024*1024*1024, DATA_UNITS_GIBIBYTE}, {10LL*1024*1024*1024*1024, DATA_UNITS_TEBIBYTE}, {~(1LL<<63), DATA_UNITS_PEBIBYTE}, -#ifdef NDEBUG +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) {-1, DATA_UNITS_BYTE}, #endif }; @@ -63,7 +63,7 @@ TEST(BytesFormattingTest, FormatBytes) { "1.9", "1.9 GB"}, {10LL*1024*1024*1024, DATA_UNITS_GIBIBYTE, "10.0", "10.0 GB"}, {100LL*1024*1024*1024, DATA_UNITS_GIBIBYTE, "100", "100 GB"}, -#ifdef NDEBUG +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) {-1, DATA_UNITS_BYTE, "", ""}, #endif }; -- cgit v1.1