diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 00:50:40 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 00:50:40 +0000 |
| commit | 7c0fccb3b1887f399ff977776f3fa535298d46d6 (patch) | |
| tree | 02164c95cc1c58b620f42291d5f47f39e705f479 /url | |
| parent | 7fc38ce8e62ed8fba442c199987a7fb10cebaf50 (diff) | |
| download | chromium_src-7c0fccb3b1887f399ff977776f3fa535298d46d6.zip chromium_src-7c0fccb3b1887f399ff977776f3fa535298d46d6.tar.gz chromium_src-7c0fccb3b1887f399ff977776f3fa535298d46d6.tar.bz2 | |
Fix url_unittests URLCanonTest.DoAppendUTF8Invalid failures with dcheck_always_on
Just make the test disabled as if in Debug mode.
BUG=383311
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/331693005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url')
| -rw-r--r-- | url/url_canon_unittest.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc index 9a766e3..469e8a0 100644 --- a/url/url_canon_unittest.cc +++ b/url/url_canon_unittest.cc @@ -132,11 +132,16 @@ TEST(URLCanonTest, DoAppendUTF8) { } } +#if defined(GTEST_HAS_DEATH_TEST) // TODO(mattm): Can't run this in debug mode for now, since the DCHECK will // cause the Chromium stacktrace dialog to appear and hang the test. // See http://crbug.com/49580. -#if defined(GTEST_HAS_DEATH_TEST) && defined(NDEBUG) -TEST(URLCanonTest, DoAppendUTF8Invalid) { +#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON) +#define MAYBE_DoAppendUTF8Invalid DoAppendUTF8Invalid +#else +#define MAYBE_DoAppendUTF8Invalid DISABLED_DoAppendUTF8Invalid +#endif +TEST(URLCanonTest, MAYBE_DoAppendUTF8Invalid) { std::string out_str; StdStringCanonOutput output(&out_str); // Invalid code point (too large). @@ -146,7 +151,7 @@ TEST(URLCanonTest, DoAppendUTF8Invalid) { EXPECT_EQ("", out_str); }, ""); } -#endif +#endif // defined(GTEST_HAS_DEATH_TEST) TEST(URLCanonTest, UTF) { // Low-level test that we handle reading, canonicalization, and writing |