diff options
| -rw-r--r-- | build/all_android.gyp | 11 | ||||
| -rwxr-xr-x | build/android/buildbot.sh | 13 | ||||
| -rw-r--r-- | build/android/gtest_filter/net_unittests_disabled | 52 | ||||
| -rwxr-xr-x | build/android/run_tests.py | 3 |
4 files changed, 75 insertions, 4 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 9c971f3..7e0d0f4 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -5,8 +5,6 @@ # This is all.gyp file for Android to prevent breakage in Android and other # platform; It will be churning a lot in the short term and eventually be merged # into all.gyp. -# -# Currently only base_unittests is supported. { 'targets': [ @@ -31,5 +29,14 @@ '../net/net.gyp:net_unittests', ], }, + { + # Experimental / in-progress targets that are expected to fail. + 'target_name': 'android_experimental', + 'type': 'none', + 'dependencies': [ + '../webkit/webkit.gyp:pull_in_webkit_unit_tests', + '../webkit/webkit.gyp:pull_in_DumpRenderTree', + ], + }, ], # targets } diff --git a/build/android/buildbot.sh b/build/android/buildbot.sh index 52a5189..b6bda9f 100755 --- a/build/android/buildbot.sh +++ b/build/android/buildbot.sh @@ -51,6 +51,19 @@ android_gyp echo "@@@BUILD_STEP Compile@@@" make -j4 +# Linking DumpRenderTree appears to hang forever? +# EXPERIMENTAL_TARGETS="DumpRenderTree webkit_unit_tests" +EXPERIMENTAL_TARGETS="webkit_unit_tests" +for target in ${EXPERIMENTAL_TARGETS} ; do + echo "@@@BUILD_STEP Experimental Compile $target @@@" + set +e + make -j4 "${target}" + set -e + if [ $? -ne 0 ] ; then + echo "@@@STEP_WARNINGS@@@" + fi +done + echo "@@@BUILD_STEP Run Tests@@@" build/android/run_tests.py -e --xvfb diff --git a/build/android/gtest_filter/net_unittests_disabled b/build/android/gtest_filter/net_unittests_disabled new file mode 100644 index 0000000..215e9ad --- /dev/null +++ b/build/android/gtest_filter/net_unittests_disabled @@ -0,0 +1,52 @@ +# List of suppressions. +# Generated by hand to get net_unittests running initially. +# Likely too aggressive disabling. +CertVerifierTest.* +CookieMonsterTest.* +DirectoryListerTest.* +DiskCacheTest.* +DiskCacheBackendTest.* +DnsConfigServiceTest.* +DnsRRResolverTest.Resolve +GZipUnitTest.* +HostResolverImplTest.* +NetUtilTest.GetNetworkList +ProxyResolverV8Test.* +TransportSecurityStateTest.ParseSidePins* +X509CertificateTest.* +X509CertificateParseTest.* +FtpDirectoryListingParserWindowsTest.Good +HttpNetworkTransactionTest.SOCKS4_HTTP_GET +HttpNetworkTransactionTest.SOCKS4_SSL_GET +HttpNetworkTransactionTest.UploadUnreadableFile +HttpNetworkTransactionTest.UnreadableUploadFileAfterAuthRestart +ProxyResolverJSBindingsTest.MyIpAddress +ProxyScriptFetcherImplTest.* +SOCKSClientSocketTest.* +SSLClientSocketTest.* +PythonUtils.PythonRunTime +URLRequestTestHTTP.* +HTTPSRequestTest.HTTPSMismatchedTest +HTTPSRequestTest.HTTPSExpiredTest +HTTPSRequestTest.HTTPSPreloadedHSTSTest +HTTPSRequestTest.ClientAuthTest +URLRequestTest.FileTest +URLRequestTest.FileDirRedirectNoCrash +URLRequestTest.DelayedCookieCallback +URLRequestTest.DoNotSendCookies +URLRequestTest.DoNotSaveCookies +URLRequestTest.DoNotSendCookies_ViaPolicy +URLRequestTest.DoNotSaveCookies_ViaPolicy +URLRequestTest.DoNotSaveEmptyCookies +URLRequestTest.DoNotSendCookies_ViaPolicy_Async +URLRequestTest.DoNotSaveCookies_ViaPolicy_Async +URLRequestTest.CookiePolicy_ForceSession +URLRequestTest.DoNotOverrideReferrer +WebSocketJobTest.ThrottlingWebSocket +WebSocketJobTest.ThrottlingWebSocketSpdyEnabled +WebSocketJobTest.ThrottlingSpdy +WebSocketJobTest.ThrottlingSpdySpdyEnabled +X509CertificateWeakDigestTest.* +FtpDirectoryListingParserTest.* +*/X509CertificateWeakDigestTest.* + diff --git a/build/android/run_tests.py b/build/android/run_tests.py index 601ccc6..19e1672 100755 --- a/build/android/run_tests.py +++ b/build/android/run_tests.py @@ -63,8 +63,7 @@ from single_test_runner import SingleTestRunner from test_package_executable import TestPackageExecutable from test_result import BaseTestResult, TestResults -_TEST_SUITES = ['base_unittests', 'sql_unittests', 'ipc_tests'] - +_TEST_SUITES = ['base_unittests', 'sql_unittests', 'ipc_tests', 'net_unittests'] class Xvfb(object): """Class to start and stop Xvfb if relevant. Nop if not Linux.""" |