generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix unit tests for android build

Browse Source
This commit is contained in:
Jörg-Christian Böhme
2018-03-04 21:26:08 +01:00
parent 73897b4357
commit 181fc0eea3
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Net/testsuite/src/ICMPClientTest.cpp
View File

@@ -52,7 +52,7 @@ void ICMPClientTest::testPing()
registerDelegates(icmpClient);
assert(icmpClient.ping("127.0.0.1") > 0);
#ifdef POCO_ANDROID
#if POCO_OS == POCO_OS_ANDROID
assert(icmpClient.ping("10.0.2.15", 4) > 0);
assert(icmpClient.ping("10.0.2.2", 4) > 0);
#else
@@ -77,7 +77,7 @@ void ICMPClientTest::testBigPing()
registerDelegates(icmpClient);
assert(icmpClient.ping("127.0.0.1", 1) > 0);
#ifdef POCO_ANDROID
#if POCO_OS == POCO_OS_ANDROID
assert(icmpClient.ping("10.0.2.15", 4) > 0);
assert(icmpClient.ping("10.0.2.2", 4) > 0);
#else

2
Net/testsuite/src/MulticastSocketTest.cpp
View File

@@ -60,7 +60,7 @@ void MulticastSocketTest::testMulticast()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}

2
Net/testsuite/src/NTPClientTest.cpp
View File

@@ -48,7 +48,7 @@ NTPClientTest::~NTPClientTest()
void NTPClientTest::testTimeSync()
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
if (ICMPClient::pingIPv4("pool.ntp.org") <= 0)
{
std::cerr << "pool.ntp.org not accessibe, test skipped" << std::endl;

16
Net/testsuite/src/NetworkInterfaceTest.cpp
View File

@@ -77,7 +77,7 @@ void NetworkInterfaceTest::testMap()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -121,7 +121,7 @@ void NetworkInterfaceTest::testList()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -141,7 +141,7 @@ void NetworkInterfaceTest::testForName()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -186,7 +186,7 @@ void NetworkInterfaceTest::testForAddress()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -206,7 +206,7 @@ void NetworkInterfaceTest::testForIndex()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -233,7 +233,7 @@ void NetworkInterfaceTest::testMapIpOnly()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -253,7 +253,7 @@ void NetworkInterfaceTest::testMapUpOnly()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}
@@ -300,7 +300,7 @@ void NetworkInterfaceTest::testListMapConformance()
}
catch(Poco::NotImplementedException e)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
throw e;
#endif
}

2
Net/testsuite/src/SocketTest.cpp
View File

@@ -503,7 +503,7 @@ void SocketTest::testSelect3()
void SocketTest::testEchoUnixLocal()
{
#if defined(POCO_OS_FAMILY_UNIX)
#if defined(POCO_ANDROID)
#if POCO_OS == POCO_OS_ANDROID
Poco::File socketFile("/data/local/tmp/SocketTest.sock");
#else
Poco::File socketFile("/tmp/SocketTest.sock");