diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 21:24:05 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 21:24:05 +0000 |
| commit | 9ec24af8b68c75f965777153e6d89079058d35d0 (patch) | |
| tree | 232a1d099491ec21a43039544be8389f8033fbce /net/ftp | |
| parent | 8681237d8644d41b7f54549fd609f6f7f11ed7df (diff) | |
| download | chromium_src-9ec24af8b68c75f965777153e6d89079058d35d0.zip chromium_src-9ec24af8b68c75f965777153e6d89079058d35d0.tar.gz chromium_src-9ec24af8b68c75f965777153e6d89079058d35d0.tar.bz2 | |
Enable FtpDirectoryListing* GUnit tests on Android.
This is part of Chrome for Android upstreaming.
BUG=136750
Review URL: https://chromiumcodereview.appspot.com/10987077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
| -rw-r--r-- | net/ftp/ftp_directory_listing_parser_windows_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc index 7297676..2a08abe 100644 --- a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc +++ b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc @@ -38,12 +38,12 @@ TEST_F(FtpDirectoryListingParserWindowsTest, Good) { { "01-06-80 02:42AM 458 Corner3.txt", FtpDirectoryListingEntry::FILE, "Corner3.txt", 458, 1980, 1, 6, 2, 42 }, -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_ANDROID) // TODO(phajdan.jr): Re-enable when 2038-year problem is fixed on Linux. { "01-06-79 02:42AM 458 Corner4", FtpDirectoryListingEntry::FILE, "Corner4", 458, 2079, 1, 6, 2, 42 }, -#endif // !defined (OS_LINUX) +#endif // !defined (OS_LINUX) && !defined(OS_ANDROID) { "01-06-1979 02:42AM 458 Readme.txt", FtpDirectoryListingEntry::FILE, "Readme.txt", 458, 1979, 1, 6, 2, 42 }, |