Skip to content

Commit b273c51

Browse files
committed
Using pthread rather than thread in test
1 parent a20549e commit b273c51

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

test/integ/ws_start_stop.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <netinet/in.h>
3434
#include <sys/socket.h>
3535
#include "httpserver.hpp"
36-
#include <thread>
36+
#include <pthread.h>
3737

3838
using namespace std;
3939
using namespace httpserver;
@@ -427,16 +427,21 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ssl_with_trust)
427427
ws.stop();
428428
LT_END_AUTO_TEST(ssl_with_trust)
429429

430-
void start_ws_blocking(webserver* ws)
430+
void* start_ws_blocking(void* par)
431431
{
432+
webserver* ws = (webserver*) par;
432433
ok_resource* ok = new ok_resource();
433434
ws->register_resource("base", ok);
434435
ws->start(true);
436+
437+
return 0x0;
435438
}
436439

437440
LT_BEGIN_AUTO_TEST(ws_start_stop_suite, blocking_server)
438441
webserver ws = create_webserver(8080);
439-
std::thread server(start_ws_blocking, &ws);
442+
443+
pthread_t tid;
444+
pthread_create(&tid, NULL, start_ws_blocking, (void *) &ws);
440445

441446
curl_global_init(CURL_GLOBAL_ALL);
442447
std::string s;
@@ -454,7 +459,10 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, blocking_server)
454459
curl_easy_cleanup(curl);
455460

456461
ws.stop();
457-
server.join();
462+
463+
char* b;
464+
pthread_join(tid,(void**) &b);
465+
free(b);
458466
LT_END_AUTO_TEST(blocking_server)
459467

460468
LT_BEGIN_AUTO_TEST_ENV()

0 commit comments

Comments
 (0)