⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 246173 in webkit


Ignore:
Timestamp:
Jun 6, 2019, 3:34:49 PM (7 years ago)
Author:
Keith Rollin
Message:

Remove SSL-based tests from TestWebKitAPI on some configurations
​https://bugs.webkit.org/show_bug.cgi?id=198551
<rdar://problem/51424996>

Reviewed by Jonathan Bedard.

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:
Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r246164 r246173  
     12019-06-06  Keith Rollin  <krollin@apple.com>
     2
     3        Remove SSL-based tests from TestWebKitAPI on some configurations
     4        https://bugs.webkit.org/show_bug.cgi?id=198551
     5        <rdar://problem/51424996>
     6
     7        Reviewed by Jonathan Bedard.
     8
     9        Not all platforms have SSL handy, so don't include SSL-based tests on
     10        those platforms.
     11
     12        * TestWebKitAPI/TCPServer.cpp:
     13        * TestWebKitAPI/TCPServer.h:
     14        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
     15        * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
     16        * TestWebKitAPI/config.h:
     17
    1182019-06-06  Daniel Bates  <dabates@apple.com>
    219

  • trunk/Tools/TestWebKitAPI/TCPServer.cpp

    r245468 r246173  
    3232#include <wtf/Optional.h>
    3333
     34#if HAVE(SSL)
    3435extern "C" {
    3536
    … …  
    5960
    6061} // extern "C"
     62#endif // HAVE(SSL)
    6163
    6264namespace TestWebKitAPI {
    6365
     66#if HAVE(SSL)
    6467template<typename> struct deleter;
    6568template<> struct deleter<BIO> {
    … …  
    9396    }
    9497};
     98#endif // HAVE(SSL)
    9599
    96100TCPServer::TCPServer(Function<void(Socket)>&& connectionHandler, size_t connections)
    … …  
    100104}
    101105
     106#if HAVE(SSL)
    102107TCPServer::TCPServer(Protocol protocol, Function<void(SSL*)>&& secureConnectionHandler)
    103108{
    … …  
    185190    listenForConnections(1);
    186191}
     192#endif // HAVE(SSL)
    187193
    188194void TCPServer::listenForConnections(size_t connections)

  • trunk/Tools/TestWebKitAPI/TCPServer.h

    r245468 r246173  
    3030#include <wtf/Vector.h>
    3131
     32#if HAVE(SSL)
    3233extern "C" {
    3334struct SSL;
    … …  
    3536int SSL_write(SSL*, const void*, int);
    3637}
     38#endif // HAVE(SSL)
    3739
    3840namespace TestWebKitAPI {
    … …  
    4547   
    4648    TCPServer(Function<void(Socket)>&&, size_t connections = 1);
     49#if HAVE(SSL)
    4750    enum class Protocol : bool {
    4851        HTTPS, HTTPSProxy
    4952    };
    5053    TCPServer(Protocol, Function<void(SSL*)>&&);
     54#endif // HAVE(SSL)
    5155    ~TCPServer();
    5256   

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm

    r245880 r246173  
    316316}
    317317
     318#if HAVE(SSL)
    318319static void verifyCertificateAndPublicKey(SecTrustRef trust)
    319320{
    … …  
    432433
    433434} // namespace TestWebKitAPI
     435
     436#endif // HAVE(SSL)

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm

    r245468 r246173  
    2525
    2626#import "config.h"
     27
     28#if HAVE(SSL)
    2729
    2830#import "TCPServer.h"
    … …  
    8688} // namespace TestWebKitAPI
    8789
     90#endif // HAVE(SSL)

  • trunk/Tools/TestWebKitAPI/config.h

    r244857 r246173  
    101101#define WK_HAVE_C_SPI 1
    102102#endif
     103
     104#if !PLATFORM(APPLETV)
     105#define HAVE_SSL 1
     106#endif
Note: See TracChangeset for help on using the changeset viewer.