Added repeat feature to selftest
This commit is contained in:
@@ -342,7 +342,6 @@ void tcp_client_4(TCP_UNIT_TEST_SIG_4)
|
|||||||
r = READ(fd, rbuf, len);
|
r = READ(fd, rbuf, len);
|
||||||
DEBUG_TEST("Sent : %s", msg.c_str());
|
DEBUG_TEST("Sent : %s", msg.c_str());
|
||||||
DEBUG_TEST("Received : %s", rbuf);
|
DEBUG_TEST("Received : %s", rbuf);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
*passed = (w == len && r == len && !err) && !strcmp(rbuf, msg.c_str());
|
*passed = (w == len && r == len && !err) && !strcmp(rbuf, msg.c_str());
|
||||||
@@ -380,13 +379,14 @@ void tcp_server_4(TCP_UNIT_TEST_SIG_4)
|
|||||||
*passed = false;
|
*passed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sockaddr_in client;
|
struct sockaddr_in client;
|
||||||
socklen_t client_addrlen = sizeof(sockaddr_in);
|
socklen_t client_addrlen = sizeof(sockaddr_in);
|
||||||
if((client_fd = ACCEPT(fd, (struct sockaddr *)&client, &client_addrlen)) < 0)
|
if((client_fd = ACCEPT(fd, (struct sockaddr *)&client, &client_addrlen)) < 0) {
|
||||||
fprintf(stderr,"error accepting connection (%d)\n", err);
|
perror("accept");
|
||||||
|
*passed = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
DEBUG_TEST("accepted connection from %s, on port %d", inet_ntoa(client.sin_addr), ntohs(client.sin_port));
|
DEBUG_TEST("accepted connection from %s, on port %d", inet_ntoa(client.sin_addr), ntohs(client.sin_port));
|
||||||
|
|
||||||
// TODO: Put this test in the general API section
|
// TODO: Put this test in the general API section
|
||||||
struct sockaddr_storage peer_addr;
|
struct sockaddr_storage peer_addr;
|
||||||
struct sockaddr_in *in4 = (struct sockaddr_in*)&peer_addr;
|
struct sockaddr_in *in4 = (struct sockaddr_in*)&peer_addr;
|
||||||
@@ -397,13 +397,10 @@ void tcp_server_4(TCP_UNIT_TEST_SIG_4)
|
|||||||
*passed = false;
|
*passed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEBUG_TEST("getpeername() => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port));
|
DEBUG_TEST("getpeername() => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port));
|
||||||
|
r = READ(client_fd, rbuf, len);
|
||||||
r = READ(client_fd, rbuf, sizeof rbuf);
|
|
||||||
w = WRITE(client_fd, rbuf, len);
|
w = WRITE(client_fd, rbuf, len);
|
||||||
DEBUG_TEST("Received : %s", rbuf);
|
DEBUG_TEST("Received : %s, r=%d, w=%d", rbuf, r, w);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
err = CLOSE(client_fd);
|
err = CLOSE(client_fd);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
@@ -440,7 +437,6 @@ void tcp_client_6(TCP_UNIT_TEST_SIG_6)
|
|||||||
struct sockaddr_storage peer_addr;
|
struct sockaddr_storage peer_addr;
|
||||||
struct sockaddr_in6 *p6 = (struct sockaddr_in6*)&peer_addr;
|
struct sockaddr_in6 *p6 = (struct sockaddr_in6*)&peer_addr;
|
||||||
socklen_t peer_addrlen = sizeof(peer_addr);
|
socklen_t peer_addrlen = sizeof(peer_addr);
|
||||||
|
|
||||||
if((err = GETPEERNAME(fd, (struct sockaddr*)&peer_addr, &peer_addrlen)) < 0) {
|
if((err = GETPEERNAME(fd, (struct sockaddr*)&peer_addr, &peer_addrlen)) < 0) {
|
||||||
perror("getpeername");
|
perror("getpeername");
|
||||||
*passed = false;
|
*passed = false;
|
||||||
@@ -452,7 +448,6 @@ void tcp_client_6(TCP_UNIT_TEST_SIG_6)
|
|||||||
|
|
||||||
w = WRITE(fd, msg.c_str(), len);
|
w = WRITE(fd, msg.c_str(), len);
|
||||||
r = READ(fd, rbuf, len);
|
r = READ(fd, rbuf, len);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
DEBUG_TEST("Sent : %s", msg.c_str());
|
DEBUG_TEST("Sent : %s", msg.c_str());
|
||||||
@@ -492,20 +487,20 @@ void tcp_server_6(TCP_UNIT_TEST_SIG_6)
|
|||||||
*passed = false;
|
*passed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sockaddr_in6 client;
|
struct sockaddr_in6 client;
|
||||||
socklen_t client_addrlen = sizeof(sockaddr_in6);
|
socklen_t client_addrlen = sizeof(sockaddr_in6);
|
||||||
if((client_fd = ACCEPT(fd, (struct sockaddr *)&client, &client_addrlen)) < 0)
|
if((client_fd = ACCEPT(fd, (struct sockaddr *)&client, &client_addrlen)) < 0) {
|
||||||
fprintf(stderr,"error accepting connection (%d)\n", err);
|
perror("accept");
|
||||||
|
*passed = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
char ipstr[INET6_ADDRSTRLEN];
|
char ipstr[INET6_ADDRSTRLEN];
|
||||||
inet_ntop(AF_INET6, &client.sin6_addr, ipstr, sizeof ipstr);
|
inet_ntop(AF_INET6, &client.sin6_addr, ipstr, sizeof ipstr);
|
||||||
DEBUG_TEST("accepted connection from %s, on port %d", ipstr, ntohs(client.sin6_port));
|
DEBUG_TEST("accepted connection from %s, on port %d", ipstr, ntohs(client.sin6_port));
|
||||||
|
|
||||||
// TODO: Put this test in the general API section
|
// TODO: Put this test in the general API section
|
||||||
struct sockaddr_storage peer_addr;
|
struct sockaddr_storage peer_addr;
|
||||||
struct sockaddr_in6 *p6 = (struct sockaddr_in6*)&peer_addr;
|
struct sockaddr_in6 *p6 = (struct sockaddr_in6*)&peer_addr;
|
||||||
socklen_t peer_addrlen = sizeof(peer_addr);
|
socklen_t peer_addrlen = sizeof(peer_addr);
|
||||||
|
|
||||||
if((err = GETPEERNAME(client_fd, (struct sockaddr*)&peer_addr, &peer_addrlen)) < 0) {
|
if((err = GETPEERNAME(client_fd, (struct sockaddr*)&peer_addr, &peer_addrlen)) < 0) {
|
||||||
perror("getpeername");
|
perror("getpeername");
|
||||||
*passed = false;
|
*passed = false;
|
||||||
@@ -514,11 +509,9 @@ void tcp_server_6(TCP_UNIT_TEST_SIG_6)
|
|||||||
char peer_addrstr[INET6_ADDRSTRLEN];
|
char peer_addrstr[INET6_ADDRSTRLEN];
|
||||||
inet_ntop(AF_INET6, &(p6->sin6_addr), peer_addrstr, INET6_ADDRSTRLEN);
|
inet_ntop(AF_INET6, &(p6->sin6_addr), peer_addrstr, INET6_ADDRSTRLEN);
|
||||||
DEBUG_TEST("getpeername() => %s : %d", peer_addrstr, ntohs(p6->sin6_port));
|
DEBUG_TEST("getpeername() => %s : %d", peer_addrstr, ntohs(p6->sin6_port));
|
||||||
|
|
||||||
r = READ(client_fd, rbuf, sizeof rbuf);
|
r = READ(client_fd, rbuf, sizeof rbuf);
|
||||||
w = WRITE(client_fd, rbuf, len);
|
w = WRITE(client_fd, rbuf, len);
|
||||||
DEBUG_TEST("Received : %s", rbuf);
|
DEBUG_TEST("Received : %s", rbuf);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
err = CLOSE(client_fd);
|
err = CLOSE(client_fd);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
@@ -573,7 +566,6 @@ void udp_client_4(UDP_UNIT_TEST_SIG_4)
|
|||||||
// rx
|
// rx
|
||||||
r = RECVFROM(fd, rbuf, STR_SIZE, 0, (struct sockaddr *)&saddr, (socklen_t *)&serverlen);
|
r = RECVFROM(fd, rbuf, STR_SIZE, 0, (struct sockaddr *)&saddr, (socklen_t *)&serverlen);
|
||||||
if(r == strlen(msg.c_str())) {
|
if(r == strlen(msg.c_str())) {
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
DEBUG_TEST("%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
DEBUG_TEST("%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
@@ -631,17 +623,14 @@ void udp_server_4(UDP_UNIT_TEST_SIG_4)
|
|||||||
long int tx_ti = get_now_ts();
|
long int tx_ti = get_now_ts();
|
||||||
while(1) {
|
while(1) {
|
||||||
sleep(1);
|
sleep(1);
|
||||||
//DEBUG_TEST("sending UDP packet");
|
|
||||||
if((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
|
if((w = SENDTO(fd, msg.c_str(), len, 0, (struct sockaddr *)remote_addr, sizeof(*remote_addr))) < 0) {
|
||||||
DEBUG_ERROR("error sending packet, err=%d", errno);
|
DEBUG_ERROR("error sending packet, err=%d", errno);
|
||||||
}
|
}
|
||||||
if(get_now_ts() >= tx_ti + 10000) {
|
if(get_now_ts() >= tx_ti + 10000) {
|
||||||
// DEBUG_TEST("get_now_ts()-tx_ti=%d", get_now_ts()-tx_ti);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
err = CLOSE(fd);
|
||||||
//err = CLOSE(fd);
|
|
||||||
DEBUG_TEST("%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
DEBUG_TEST("%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
sprintf(details, "%s, err=%d, r=%d, w=%d", testname.c_str(), err, r, w);
|
||||||
DEBUG_TEST("Sent : %s", msg.c_str());
|
DEBUG_TEST("Sent : %s", msg.c_str());
|
||||||
@@ -1021,8 +1010,8 @@ void tcp_server_sustained_4(TCP_UNIT_TEST_SIG_4)
|
|||||||
}
|
}
|
||||||
long int tx_tf = get_now_ts();
|
long int tx_tf = get_now_ts();
|
||||||
DEBUG_TEST("wrote=%d", w);
|
DEBUG_TEST("wrote=%d", w);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
|
err = CLOSE(client_fd);
|
||||||
// Compute time deltas and transfer rates
|
// Compute time deltas and transfer rates
|
||||||
float tx_dt = (tx_tf - tx_ti) / (float)1000;
|
float tx_dt = (tx_tf - tx_ti) / (float)1000;
|
||||||
float rx_dt = (rx_tf - rx_ti) / (float)1000;
|
float rx_dt = (rx_tf - rx_ti) / (float)1000;
|
||||||
@@ -1110,8 +1099,8 @@ void tcp_server_sustained_6(TCP_UNIT_TEST_SIG_6)
|
|||||||
}
|
}
|
||||||
long int tx_tf = get_now_ts();
|
long int tx_tf = get_now_ts();
|
||||||
DEBUG_TEST("wrote=%d", w);
|
DEBUG_TEST("wrote=%d", w);
|
||||||
sleep(WAIT_FOR_TRANSMISSION_TO_COMPLETE);
|
|
||||||
err = CLOSE(fd);
|
err = CLOSE(fd);
|
||||||
|
err = CLOSE(client_fd);
|
||||||
// Compute time deltas and transfer rates
|
// Compute time deltas and transfer rates
|
||||||
float tx_dt = (tx_tf - tx_ti) / (float)1000;
|
float tx_dt = (tx_tf - tx_ti) / (float)1000;
|
||||||
float rx_dt = (rx_tf - rx_ti) / (float)1000;
|
float rx_dt = (rx_tf - rx_ti) / (float)1000;
|
||||||
@@ -2187,18 +2176,21 @@ void bind_to_localhost_test(int port)
|
|||||||
|
|
||||||
int main(int argc , char *argv[])
|
int main(int argc , char *argv[])
|
||||||
{
|
{
|
||||||
if(argc < 5) {
|
if(argc < 6) {
|
||||||
fprintf(stderr, "usage: selftest <selftest.conf> <alice|bob|ted|carol> to <bob|alice|ted|carol>\n");
|
fprintf(stderr, "usage: selftest <num_repeats> <selftest.conf> <alice|bob|ted|carol> to <bob|alice|ted|carol>\n");
|
||||||
fprintf(stderr, "e.g. : selftest test/test.conf alice to bob\n");
|
fprintf(stderr, "e.g. : selftest 3 test/test.conf alice to bob\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string from = argv[2];
|
int num_repeats = atoi(argv[1]);
|
||||||
std::string to = argv[4];
|
std::string path = argv[2];
|
||||||
|
std::string from = argv[3];
|
||||||
|
std::string to = argv[5];
|
||||||
std::string me = from;
|
std::string me = from;
|
||||||
std::vector<std::string> results;
|
std::vector<std::string> results;
|
||||||
std::string remote_echo_ipv4, smode;
|
std::string remote_echo_ipv4, smode;
|
||||||
std::string nwid, stype, path = argv[1];
|
|
||||||
|
std::string nwid, stype;
|
||||||
std::string ipstr, ipstr6, local_ipstr, local_ipstr6, remote_ipstr, remote_ipstr6;
|
std::string ipstr, ipstr6, local_ipstr, local_ipstr6, remote_ipstr, remote_ipstr6;
|
||||||
|
|
||||||
int err = 0;
|
int err = 0;
|
||||||
@@ -2284,9 +2276,13 @@ int main(int argc , char *argv[])
|
|||||||
sleep(1);
|
sleep(1);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// closure test
|
for(int i=0; i<num_repeats; i++)
|
||||||
|
{
|
||||||
|
DEBUG_TEST("\n\n\n --- COMPREHENSIVE TEST ITERATION: %d out of %d ---\n\n\n", i, num_repeats);
|
||||||
|
|
||||||
#if defined(__SELFTEST__)
|
// closure test
|
||||||
|
|
||||||
|
#if defined(__SELFTEST__)
|
||||||
port = 1000;
|
port = 1000;
|
||||||
struct sockaddr_in in4;
|
struct sockaddr_in in4;
|
||||||
DEBUG_TEST("testing closures by binding to: %s", local_ipstr.c_str());
|
DEBUG_TEST("testing closures by binding to: %s", local_ipstr.c_str());
|
||||||
@@ -2294,56 +2290,56 @@ int main(int argc , char *argv[])
|
|||||||
close_test((struct sockaddr*)&in4);
|
close_test((struct sockaddr*)&in4);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// Test adding, resolving, and removing a DNS server
|
// Test adding, resolving, and removing a DNS server
|
||||||
|
|
||||||
// ipv = 4;
|
// ipv = 4;
|
||||||
// str2addr(remote_ipstr, port, ipv, (struct sockaddr *)&remote_addr);
|
// str2addr(remote_ipstr, port, ipv, (struct sockaddr *)&remote_addr);
|
||||||
// dns_test((struct sockaddr *)&remote_addr);
|
// dns_test((struct sockaddr *)&remote_addr);
|
||||||
|
|
||||||
// close_while_writing_test();
|
// close_while_writing_test();
|
||||||
|
|
||||||
// localhost bind test
|
// localhost bind test
|
||||||
|
|
||||||
// bind_to_localhost_test(port);
|
// bind_to_localhost_test(port);
|
||||||
|
|
||||||
// Transmission Tests
|
// Transmission Tests
|
||||||
|
|
||||||
// RANDOM API TEST
|
// RANDOM API TEST
|
||||||
//random_api_test();
|
//random_api_test();
|
||||||
|
|
||||||
// SLAM API TEST
|
// SLAM API TEST
|
||||||
//slam_api_test();
|
//slam_api_test();
|
||||||
|
|
||||||
// BAD ARGS API TEST
|
// BAD ARGS API TEST
|
||||||
//test_bad_args();
|
//test_bad_args();
|
||||||
|
|
||||||
// OBSCURE API TEST
|
// OBSCURE API TEST
|
||||||
//obscure_api_test();
|
//obscure_api_test();
|
||||||
|
|
||||||
#endif // __SELFTEST__
|
#endif // __SELFTEST__
|
||||||
|
|
||||||
port = start_port;
|
port = start_port+(100*i); // arbitrary
|
||||||
cnt = 1024*16;
|
cnt = 1024*3;
|
||||||
op = TEST_OP_N_BYTES;
|
op = TEST_OP_N_BYTES;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
tcp-ip4-client tcp-ip6-client udp-ip4-client udp-ip6-client
|
int stack_array[100];
|
||||||
| | | | |
|
stack_array[1] = 0;
|
||||||
tcp-ip4-server | OK | | OK | |
|
return stack_array[argc + 100]; // BOOM
|
||||||
tcp-ip6-server | | OK | | OK |
|
|
||||||
udp-ip4-server | OK | | OK | |
|
|
||||||
udp-ip6-server | | OK | | OK |
|
|
||||||
|
|
||||||
*/
|
int mybuf[10];
|
||||||
|
mybuf[11] = 9;
|
||||||
|
memcpy(mybuf, "what the hell is this", 55);
|
||||||
|
*/
|
||||||
|
|
||||||
// set start time here since we aren't waiting for libzt to come online in NATIVETEST mode
|
// set start time here since we aren't waiting for libzt to come online in NATIVETEST mode
|
||||||
#if defined(__NATIVETEST__)
|
#if defined(__NATIVETEST__)
|
||||||
long int selftest_start_time = get_now_ts();
|
long int selftest_start_time = get_now_ts();
|
||||||
subtest_expected_duration = 0; // initial value, wait for other instance to come online
|
subtest_expected_duration = 5; // initial value, wait for other instance to come online
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(LIBZT_IPV4)
|
#if defined(LIBZT_IPV4)
|
||||||
// UDP 4 client/server
|
// UDP 4 client/server
|
||||||
|
|
||||||
ipv = 4;
|
ipv = 4;
|
||||||
@@ -2381,7 +2377,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// UDP 4 sustained transfer
|
// UDP 4 sustained transfer
|
||||||
|
|
||||||
ipv = 4;
|
ipv = 4;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2418,7 +2414,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// TCP 4 client/server
|
// TCP 4 client/server
|
||||||
|
|
||||||
ipv = 4;
|
ipv = 4;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2451,7 +2447,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// TCP 4 sustained transfer
|
// TCP 4 sustained transfer
|
||||||
|
|
||||||
ipv = 4;
|
ipv = 4;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2509,13 +2505,13 @@ udp-ip6-server | | OK | | OK
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#endif // LIBZT_IPV4
|
#endif // LIBZT_IPV4
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(LIBZT_IPV6)
|
#if defined(LIBZT_IPV6)
|
||||||
// UDP 6 client/server
|
// UDP 6 client/server
|
||||||
|
|
||||||
ipv = 6;
|
ipv = 6;
|
||||||
@@ -2555,7 +2551,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// UDP 6 sustained transfer
|
// UDP 6 sustained transfer
|
||||||
|
|
||||||
ipv = 6;
|
ipv = 6;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2592,7 +2588,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// TCP 6 client/server
|
// TCP 6 client/server
|
||||||
|
|
||||||
ipv = 6;
|
ipv = 6;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2626,7 +2622,7 @@ udp-ip6-server | | OK | | OK
|
|||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
|
|
||||||
// TCP 6 sustained transfer
|
// TCP 6 sustained transfer
|
||||||
|
|
||||||
ipv = 6;
|
ipv = 6;
|
||||||
subtest_start_time_offset+=subtest_expected_duration;
|
subtest_start_time_offset+=subtest_expected_duration;
|
||||||
@@ -2658,13 +2654,14 @@ udp-ip6-server | | OK | | OK
|
|||||||
}
|
}
|
||||||
RECORD_RESULTS(passed, details, &results);
|
RECORD_RESULTS(passed, details, &results);
|
||||||
port++;
|
port++;
|
||||||
#endif // LIBZT_IPV6
|
#endif // LIBZT_IPV6
|
||||||
|
|
||||||
// Print results of all tests
|
// Print results of all tests
|
||||||
printf("--------------------------------------------------------------------------------\n");
|
printf("--------------------------------------------------------------------------------\n");
|
||||||
for(int i=0;i<results.size(); i++) {
|
for(int i=0;i<results.size(); i++) {
|
||||||
fprintf(stderr, "%s\n", results[i].c_str());
|
fprintf(stderr, "%s\n", results[i].c_str());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user