diff options
| author | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 00:45:31 +0000 |
|---|---|---|
| committer | courage@chromium.org <courage@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 00:45:31 +0000 |
| commit | 676341d985dd5236d1ee7374363f9822d068a177 (patch) | |
| tree | 7d4800dd62453faf64d772f5667b28d47d7d4c02 /remoting/base | |
| parent | 17602f12e1ef7ea4f7c7c0ec42ed5eeec9ffb86f (diff) | |
| download | chromium_src-676341d985dd5236d1ee7374363f9822d068a177.zip chromium_src-676341d985dd5236d1ee7374363f9822d068a177.tar.gz chromium_src-676341d985dd5236d1ee7374363f9822d068a177.tar.bz2 | |
disable ResourcesTest.ProductName
Disabled remoting_unittests.ResourcesTest.ProductName on Linux because it breaks "Linux Chromium OS ASAN Tests".
r215996 almost did this, but the MAYBE macro wasn't used.
BUG=269143
TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/22300011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/resources_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc index 92eb914..d2b2d23 100644 --- a/remoting/base/resources_unittest.cc +++ b/remoting/base/resources_unittest.cc @@ -10,13 +10,6 @@ namespace remoting { -// TODO(alexeypa): Reenable the test once http://crbug.com/269143 is fixed. -#if defined(OS_WIN) || defined(OS_MACOSX) -#define MAYBE_ProductName ProductName -#else -#define MAYBE_ProductName DISABLED_ProductName -#endif - class ResourcesTest : public testing::Test { protected: ResourcesTest(): resources_available_(false) { @@ -33,7 +26,14 @@ class ResourcesTest : public testing::Test { bool resources_available_; }; -TEST_F(ResourcesTest, ProductName) { +// TODO(alexeypa): Reenable the test once http://crbug.com/269143 is fixed. +#if !defined(OS_CHROMEOS) +#define MAYBE_ProductName ProductName +#else +#define MAYBE_ProductName DISABLED_ProductName +#endif + +TEST_F(ResourcesTest, MAYBE_ProductName) { #if defined(GOOGLE_CHROME_BUILD) std::string expected_product_name = "Chrome Remote Desktop"; #else // defined(GOOGLE_CHROME_BUILD) |