lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Yet another attempt to handle the different directory structures in the different CI test environments

Browse Source
This commit is contained in:
bel
2015-08-06 21:53:42 +02:00
parent 8ccbe6b830
commit e544929db6
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/public_server.c
View File

@@ -69,7 +69,7 @@ START_TEST(test_the_test_environment)
/* Check the pem file */ /* Check the pem file */
#ifdef _WIN32 #ifdef _WIN32
strcpy(buf, wd); strcpy(buf, wd);
strcat(buf, "..\\..\\resources\\ssl_cert.pem"); strcat(buf, "..\\..\\..\\resources\\ssl_cert.pem");
f = fopen(buf, "rb"); f = fopen(buf, "rb");
#else #else
strcpy(buf, wd); strcpy(buf, wd);
@@ -164,7 +164,11 @@ START_TEST(test_mg_start_stop_https_server)
"listening_ports", "listening_ports",
"8080,8443s", "8080,8443s",
"ssl_certificate", "ssl_certificate",
#ifdef _WIN32
"..\\..\\..\\resources/ssl_cert.pem", // TODO: the different paths used in the different test system is an unsolved problem
#else
"../../resources/ssl_cert.pem", // TODO: fix path in CI test environment "../../resources/ssl_cert.pem", // TODO: fix path in CI test environment
#endif
NULL, NULL,
}; };
size_t ports_cnt; size_t ports_cnt;
@@ -287,7 +291,11 @@ START_TEST(test_request_handlers)
OPTIONS[3] = "."; OPTIONS[3] = ".";
#ifndef NO_SSL #ifndef NO_SSL
OPTIONS[4] = "ssl_certificate"; OPTIONS[4] = "ssl_certificate";
OPTIONS[5] = "../../resources/ssl_cert.pem"; #ifdef _WIN32
OPTIONS[5] = "..\\..\\..\\resources/ssl_cert.pem"; // TODO: the different paths used in the different test system is an unsolved problem
#else
OPTIONS[5] = "../../resources/ssl_cert.pem"; // TODO: fix path in CI test environment
#endif
#endif #endif
ck_assert(OPTIONS[sizeof(OPTIONS) / sizeof(OPTIONS[0]) - 1] == NULL); ck_assert(OPTIONS[sizeof(OPTIONS) / sizeof(OPTIONS[0]) - 1] == NULL);
ck_assert(OPTIONS[sizeof(OPTIONS) / sizeof(OPTIONS[0]) - 2] == NULL); ck_assert(OPTIONS[sizeof(OPTIONS) / sizeof(OPTIONS[0]) - 2] == NULL);