Attachment 371521 Details for Bug 198551 – Patch

[patch] Patch

bug-198551-20190606124927.patch (text/plain), 4.81 KB, created by Keith Rollin on 2019-06-06 12:49:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-06-06 12:49:28 PDT

Size: 4.81 KB

patch

obsolete

>Subversion Revision: 246050
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b5a029e0d599ec2e8a6dee04ea2a691fa24e48cb..5ad0e30b4ec676da6710101b7a93392f5993d227 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-06-06  Keith Rollin  <krollin@apple.com>
>+
>+        Remove SSL-based tests from TestWebKitAPI on some configurations
>+        https://bugs.webkit.org/show_bug.cgi?id=198551
>+        <rdar://problem/51424996>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Not all platforms have SSL handy, so don't include SSL-based tests on
>+        those platforms.
>+
>+        * TestWebKitAPI/TCPServer.cpp:
>+        * TestWebKitAPI/TCPServer.h:
>+        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
>+        * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
>+        * TestWebKitAPI/config.h:
>+
> 2019-06-03  Sihui Liu  <sihui_liu@apple.com>
> 
>         [ Mac WK2 ] TestWebKitAPI.WKWebView.LocalStorageProcessCrashes is a flaky timeout when run locally.
>diff --git a/Tools/TestWebKitAPI/TCPServer.cpp b/Tools/TestWebKitAPI/TCPServer.cpp
>index 31b147012668606a1e41ee1d5a102fa107533d72..921a9e7cd62c41ad8baa1d0e9325bc2e43281375 100644
>--- a/Tools/TestWebKitAPI/TCPServer.cpp
>+++ b/Tools/TestWebKitAPI/TCPServer.cpp
>@@ -31,6 +31,7 @@
> #include <unistd.h>
> #include <wtf/Optional.h>
> 
>+#if HAVE(SSL)
> extern "C" {
> 
> struct BIO;
>@@ -58,9 +59,11 @@ int SSL_accept(SSL*);
> int SSL_set_fd(SSL*, int);
> 
> } // extern "C"
>+#endif // HAVE(SSL)
> 
> namespace TestWebKitAPI {
> 
>+#if HAVE(SSL)
> template<typename> struct deleter;
> template<> struct deleter<BIO> {
>     void operator()(BIO* bio)
>@@ -92,6 +95,7 @@ template<> struct deleter<EVP_PKEY> {
>         EVP_PKEY_free(key);
>     }
> };
>+#endif // HAVE(SSL)
> 
> TCPServer::TCPServer(Function<void(Socket)>&& connectionHandler, size_t connections)
>     : m_connectionHandler(WTFMove(connectionHandler))
>@@ -99,6 +103,7 @@ TCPServer::TCPServer(Function<void(Socket)>&& connectionHandler, size_t connecti
>     listenForConnections(connections);
> }
> 
>+#if HAVE(SSL)
> TCPServer::TCPServer(Protocol protocol, Function<void(SSL*)>&& secureConnectionHandler)
> {
>     auto startSecureConnection = [secureConnectionHandler = WTFMove(secureConnectionHandler)] (Socket socket) {
>@@ -184,6 +189,7 @@ TCPServer::TCPServer(Protocol protocol, Function<void(SSL*)>&& secureConnectionH
>     }
>     listenForConnections(1);
> }
>+#endif // HAVE(SSL)
> 
> void TCPServer::listenForConnections(size_t connections)
> {
>diff --git a/Tools/TestWebKitAPI/TCPServer.h b/Tools/TestWebKitAPI/TCPServer.h
>index fbe81a28ed4f4acf10e37c59e8d628cd56c6e8b7..61ddf05175140041dd7afbd348439e96f70d464c 100644
>--- a/Tools/TestWebKitAPI/TCPServer.h
>+++ b/Tools/TestWebKitAPI/TCPServer.h
>@@ -29,11 +29,13 @@
> #include <wtf/Function.h>
> #include <wtf/Vector.h>
> 
>+#if HAVE(SSL)
> extern "C" {
> struct SSL;
> int SSL_read(SSL*, void*, int);
> int SSL_write(SSL*, const void*, int);
> }
>+#endif // HAVE(SSL)
> 
> namespace TestWebKitAPI {
> 
>@@ -44,10 +46,12 @@ public:
>     static constexpr Port InvalidPort = 0;
>     
>     TCPServer(Function<void(Socket)>&&, size_t connections = 1);
>+#if HAVE(SSL)
>     enum class Protocol : bool {
>         HTTPS, HTTPSProxy
>     };
>     TCPServer(Protocol, Function<void(SSL*)>&&);
>+#endif // HAVE(SSL)
>     ~TCPServer();
>     
>     Port port() const { return m_port; }
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm
>index 7ccba02a7773d53f496d7507461e8b31be195319..6ce9bd4e1e2c40c2a05272d81f943672dc3efb2e 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm
>@@ -315,6 +315,7 @@ TEST(Challenge, BasicProposedCredential)
>     Util::run(&removedCredential);
> }
> 
>+#if HAVE(SSL)
> static void verifyCertificateAndPublicKey(SecTrustRef trust)
> {
>     EXPECT_NOT_NULL(trust);
>@@ -431,3 +432,5 @@ TEST(WebKit, ServerTrust)
> }
> 
> } // namespace TestWebKitAPI
>+
>+#endif // HAVE(SSL)
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm
>index 56bf9fd02564782fcc8dca0412566a78d22681a3..0d90f3872431bf22f2348ef39fef5e7694679461 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm
>@@ -25,6 +25,8 @@
> 
> #import "config.h"
> 
>+#if HAVE(SSL)
>+
> #import "TCPServer.h"
> #import "Utilities.h"
> #import <WebKit/WKWebsiteDataStorePrivate.h>
>@@ -85,3 +87,4 @@ TEST(WebKit, HTTPSProxy)
> 
> } // namespace TestWebKitAPI
> 
>+#endif // HAVE(SSL)
>diff --git a/Tools/TestWebKitAPI/config.h b/Tools/TestWebKitAPI/config.h
>index 42c1afc0bb1dbce441def2a80a5de63cfa04f187..003f90a8bc018e46d7cfa83c55d715b62621425d 100644
>--- a/Tools/TestWebKitAPI/config.h
>+++ b/Tools/TestWebKitAPI/config.h
>@@ -100,3 +100,7 @@
> #if !PLATFORM(IOS_FAMILY) && !defined(BUILDING_JSCONLY__)
> #define WK_HAVE_C_SPI 1
> #endif
>+
>+#if !PLATFORM(APPLETV)
>+#define HAVE_SSL 1
>+#endif

Actions: View | Formatted Diff | Diff

Attachments on bug 198551: 371362 | 371419 | 371521