denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Use Windows path for chunk tests, and socket functions if required

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 15:52:59 +02:00
parent a8c86599e4
commit 7458952575
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_chunk.c
+10 -2
View File
@@ -790,7 +790,11 @@ END_TEST
START_TEST(test_chunk_map) START_TEST(test_chunk_map)
{ {
chunk_t *map, contents = chunk_from_chars(0x01,0x02,0x03,0x04,0x05); chunk_t *map, contents = chunk_from_chars(0x01,0x02,0x03,0x04,0x05);
#ifdef WIN32
char *path = "C:\\Windows\\Temp\\strongswan-chunk-map-test";
#else
char *path = "/tmp/strongswan-chunk-map-test"; char *path = "/tmp/strongswan-chunk-map-test";
#endif
ck_assert(chunk_write(contents, path, 022, TRUE)); ck_assert(chunk_write(contents, path, 022, TRUE));
@@ -827,7 +831,11 @@ END_TEST
START_TEST(test_chunk_from_fd_file) START_TEST(test_chunk_from_fd_file)
{ {
chunk_t in, contents = chunk_from_chars(0x01,0x02,0x03,0x04,0x05); chunk_t in, contents = chunk_from_chars(0x01,0x02,0x03,0x04,0x05);
#ifdef WIN32
char *path = "C:\\Windows\\Temp\\strongswan-chunk-fd-test";
#else
char *path = "/tmp/strongswan-chunk-fd-test"; char *path = "/tmp/strongswan-chunk-fd-test";
#endif
int fd; int fd;
ck_assert(chunk_write(contents, path, 022, TRUE)); ck_assert(chunk_write(contents, path, 022, TRUE));
@@ -849,7 +857,7 @@ START_TEST(test_chunk_from_fd_skt)
int s[2]; int s[2];
ck_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0); ck_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, s) == 0);
ck_assert(write(s[1], contents.ptr, contents.len) == contents.len); ck_assert_int_eq(send(s[1], contents.ptr, contents.len, 0), contents.len);
close(s[1]); close(s[1]);
ck_assert_msg(chunk_from_fd(s[0], &in), "%s", strerror(errno)); ck_assert_msg(chunk_from_fd(s[0], &in), "%s", strerror(errno));
close(s[0]); close(s[0]);
@@ -866,7 +874,7 @@ void *chunk_from_fd_run(void *data)
for (i = 0; i < FROM_FD_COUNT; i++) for (i = 0; i < FROM_FD_COUNT; i++)
{ {
ck_assert(write(fd, &i, sizeof(i)) == sizeof(i)); ck_assert(send(fd, &i, sizeof(i), 0) == sizeof(i));
} }
close(fd); close(fd);
return NULL; return NULL;