diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:59:01 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 20:59:01 +0000 |
| commit | 20960e074cf789825155f771e1c035df41cd0e75 (patch) | |
| tree | 560b967c07210bda790dbeebf6174e3e971b5eb7 /ui/base/text | |
| parent | c4f7571e88637185eb79e598bd3b6301490a2255 (diff) | |
| download | chromium_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 'ui/base/text')
| -rw-r--r-- | ui/base/text/bytes_formatting_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 }; |