summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 22:19:58 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 22:19:58 +0000
commitf13c8188ee095b5c6b13ff84266a23018c680ded (patch)
tree2020cc528ab777ae4c17a66191833f378167b037 /remoting
parentbc2283ab6a3c4ecc3605e7f4566759821f75c036 (diff)
downloadchromium_src-f13c8188ee095b5c6b13ff84266a23018c680ded.zip
chromium_src-f13c8188ee095b5c6b13ff84266a23018c680ded.tar.gz
chromium_src-f13c8188ee095b5c6b13ff84266a23018c680ded.tar.bz2
Disabled remoting_unittests.ResourcesTest.ProductName on Linux because it breaks "Linux Chromium OS ASAN Tests".
TBR=dpapad@chromium.org BUG=269143 Review URL: https://codereview.chromium.org/22349003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/base/resources_unittest.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc
index b02a12b..92eb914 100644
--- a/remoting/base/resources_unittest.cc
+++ b/remoting/base/resources_unittest.cc
@@ -10,6 +10,13 @@
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) {