diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 16:38:50 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 16:38:50 +0000 |
| commit | f70e06b8bed61d03babb996149f859b4878508d1 (patch) | |
| tree | f9d83b5a4cd806d86e261547b8acb890b805bba2 /remoting/base | |
| parent | 4c6ec07b5f5fb8ba15cd5a986f0df49cccad4297 (diff) | |
| download | chromium_src-f70e06b8bed61d03babb996149f859b4878508d1.zip chromium_src-f70e06b8bed61d03babb996149f859b4878508d1.tar.gz chromium_src-f70e06b8bed61d03babb996149f859b4878508d1.tar.bz2 | |
Converted remoting_unittests back to be a plain executable.
This should fix Mac ASAN and mac_rel bots.
BUG=268043
R=kalman@chromium.org
Review URL: https://codereview.chromium.org/22286003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/resources_unittest.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc index d2b2d23..d1bc851 100644 --- a/remoting/base/resources_unittest.cc +++ b/remoting/base/resources_unittest.cc @@ -26,14 +26,9 @@ class ResourcesTest : public testing::Test { bool resources_available_; }; -// 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) { +// TODO(alexeypa): Reenable the test once http://crbug.com/269143 (ChromeOS) and +// http://crbug.com/268043 (MacOS) are fixed. +TEST_F(ResourcesTest, DISABLED_ProductName) { #if defined(GOOGLE_CHROME_BUILD) std::string expected_product_name = "Chrome Remote Desktop"; #else // defined(GOOGLE_CHROME_BUILD) |