generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-30 07:26:33 +02:00
Code Issues Projects Releases Wiki Activity

Fix parsing of CPPUNIT_IGNORE for Windows by allowing space in the test name.

Browse Source 
Now, in the list, each test name should be separated by a comma instead of a space.

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2015-12-18 12:27:27 +01:00
parent 0f9e561b9a
commit 88f937698b
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CppUnit/src/TextTestResult.cpp
View File

@ -43,9 +43,10 @@ void TextTestResult::setup()
std::string::const_iterator end = ignored.end();
while (it != end)
{
while (it != end && std::isspace(*it)) ++it;
while (it != end && (std::isspace(*it) || *it == '"')) ++it;
std::string test;
while (it != end && !std::isspace(*it)) test += *it++;
while (it != end && *it != ',' && *it != '"') test += *it++;
if (it != end && (*it == ',' || *it == '"')) ++it;
if (!test.empty()) _ignored.insert(test);
}
}

18
travis/runtests.sh
View File

@ -2,15 +2,15 @@ trap -p
set -ev
export POCO_BASE=`pwd`
export CPPUNIT_IGNORE="\
N7CppUnit10TestCallerI8PathTestEE.testExpand \
N7CppUnit10TestCallerI13RawSocketTestEE.testEchoIPv4 \
N7CppUnit10TestCallerI13RawSocketTestEE.testSendToReceiveFromIPv4 \
N7CppUnit10TestCallerI14ICMPClientTestEE.testPing \
N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testProxy \
N7CppUnit10TestCallerI22HTTPSStreamFactoryTestEE.testProxy \
N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast \
N7CppUnit10TestCallerI13NTPClientTestEE.testTimeSync \
"
N7CppUnit10TestCallerI8PathTestEE.testExpand, \
N7CppUnit10TestCallerI13RawSocketTestEE.testEchoIPv4, \
N7CppUnit10TestCallerI13RawSocketTestEE.testSendToReceiveFromIPv4, \
N7CppUnit10TestCallerI14ICMPClientTestEE.testPing, \
N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testProxy, \
N7CppUnit10TestCallerI22HTTPSStreamFactoryTestEE.testProxy, \
N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast, \
N7CppUnit10TestCallerI13NTPClientTestEE.testTimeSync"
export EXCLUDE_TESTS="Data/MySQL Data/ODBC PDF"
export PATH=$PATH:.
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.