Skip to content

Commit

Permalink
lib-http: Link test-http-client libssl_iostream_openssl.so directly.
Browse files Browse the repository at this point in the history
This way it can be run without having to do make install first.
  • Loading branch information
sirainen committed Sep 16, 2016
1 parent fe4058e commit c45da70
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lib-http/Makefile.am
Expand Up @@ -158,7 +158,8 @@ test_http_payload_DEPENDENCIES = \
test_http_client_SOURCES = test-http-client.c
test_http_client_LDFLAGS = -export-dynamic
test_http_client_LDADD = \
$(test_http_libs)
$(test_http_libs) \
../lib-ssl-iostream/libssl_iostream_openssl.la
test_http_client_DEPENDENCIES = \
$(test_http_deps)

Expand Down
3 changes: 3 additions & 0 deletions src/lib-http/test-http-client.c
Expand Up @@ -9,6 +9,7 @@
#include "http-client.h"
#include "dns-lookup.h"
#include "iostream-ssl.h"
#include "iostream-openssl.h"

struct http_test_request {
struct io *io;
Expand Down Expand Up @@ -342,6 +343,7 @@ int main(int argc, char *argv[])
struct ioloop *ioloop;

lib_init();
iostream_openssl_init();

ioloop = io_loop_create();
io_loop_set_running(ioloop);
Expand Down Expand Up @@ -398,5 +400,6 @@ int main(int argc, char *argv[])
dns_client_deinit(&dns_client);

io_loop_destroy(&ioloop);
iostream_openssl_deinit();
lib_deinit();
}

0 comments on commit c45da70

Please sign in to comment.