Default to ipv4 for unit tests, add ipv6 option

This commit is contained in:
Mike Ellery
2018-06-26 14:15:13 -07:00
committed by Nik Bougalis
parent 49bcdda418
commit 63370b4441
4 changed files with 17 additions and 8 deletions

View File

@@ -216,7 +216,7 @@ static int runUnitTests(
bool quiet,
bool log,
bool child,
bool ipv4,
bool ipv6,
std::size_t num_jobs,
int argc,
char** argv)
@@ -224,8 +224,7 @@ static int runUnitTests(
using namespace beast::unit_test;
using namespace ripple::test;
if (ipv4)
ripple::test::envUseIPv4 = true;
ripple::test::envUseIPv4 = (! ipv6);
if (!child && num_jobs == 1)
{
@@ -376,7 +375,7 @@ int run (int argc, char** argv)
"argument is handled individually by any suite that accesses it -- "
"as such, it typically only make sense to provide this when running "
"a single suite.")
("unittest-ipv4", "Use IPv4 localhost when running unittests (default is IPv6).")
("unittest-ipv6", "Use IPv6 localhost when running unittests (default is IPv4).")
("unittest-log",
"Force unit test log message output. Only useful in combination with "
"--quiet, in which case log messages will print but suite/case names "
@@ -457,7 +456,7 @@ int run (int argc, char** argv)
bool (vm.count ("quiet")),
bool (vm.count ("unittest-log")),
unittestChild,
bool (vm.count ("unittest-ipv4")),
bool (vm.count ("unittest-ipv6")),
numJobs,
argc,
argv);