diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 01:37:15 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 01:37:15 +0000 |
| commit | b05be39e20ae9d70bc54c7511d8199517294a2dd (patch) | |
| tree | 24750b9f4e7ce4061740c08027cea3855572c1af /app/clipboard/clipboard_unittest.cc | |
| parent | 53adb9a6d5c506d8df8a08adc092acd524a79753 (diff) | |
| download | chromium_src-b05be39e20ae9d70bc54c7511d8199517294a2dd.zip chromium_src-b05be39e20ae9d70bc54c7511d8199517294a2dd.tar.gz chromium_src-b05be39e20ae9d70bc54c7511d8199517294a2dd.tar.bz2 | |
OpenBSD/FreeBSD ifdefs and GYP changes for app/ directory
- Use OS_POSIX && !OS_MACOSX defines to capture Linux/*BSD as they
have many similarities, use other defines instead of OS_LINUX
where sensible.
Based on original work by Sprewell and Ben Laurie on FreeBSD port
Review URL: http://codereview.chromium.org/548126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/clipboard/clipboard_unittest.cc')
| -rw-r--r-- | app/clipboard/clipboard_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc index 6f19d97..81f400d 100644 --- a/app/clipboard/clipboard_unittest.cc +++ b/app/clipboard/clipboard_unittest.cc @@ -130,7 +130,7 @@ TEST_F(ClipboardTest, TrickyHTMLTest) { } // TODO(estade): Port the following test (decide what target we use for urls) -#if !defined(OS_LINUX) +#if !defined(OS_POSIX) || defined(OS_MACOSX) TEST_F(ClipboardTest, BookmarkTest) { Clipboard clipboard; @@ -213,7 +213,7 @@ TEST_F(ClipboardTest, URLTest) { #endif // defined(OS_LINUX) } -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX)) TEST_F(ClipboardTest, DataTest) { Clipboard clipboard; const char* format = "chromium/x-test-format"; |