diff options
| -rw-r--r-- | build/android/gtest_filter/net_unittests_disabled | 2 | ||||
| -rw-r--r-- | net/ftp/ftp_directory_listing_parser_windows_unittest.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build/android/gtest_filter/net_unittests_disabled b/build/android/gtest_filter/net_unittests_disabled index be5af81..3cad90b 100644 --- a/build/android/gtest_filter/net_unittests_disabled +++ b/build/android/gtest_filter/net_unittests_disabled @@ -9,7 +9,6 @@ TransportSecurityStateTest.ParseSidePins* # BUG=135165 X509CertificateTest.* X509CertificateParseTest.* -FtpDirectoryListingParserWindowsTest.Good HttpNetworkTransactionSpdy2Test.SOCKS4_HTTP_GET HttpNetworkTransactionSpdy2Test.SOCKS4_SSL_GET HttpNetworkTransactionSpdy21Test.SOCKS4_HTTP_GET @@ -53,7 +52,6 @@ WebSocketJobTest.ThrottlingWebSocketSpdyEnabled WebSocketJobTest.ThrottlingSpdy WebSocketJobTest.ThrottlingSpdySpdyEnabled X509CertificateWeakDigestTest.* -FtpDirectoryListingParserTest.* */X509CertificateWeakDigestTest.* TransportSecurityStateTest.BogusPinsHeaders TransportSecurityStateTest.ValidPinsHeadersSHA1 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 }, |