From 88f937698b56f757bfb7dd644db9965528d9243f Mon Sep 17 00:00:00 2001
From: FrancisANDRE <zosrothko@orange.fr>
Date: Fri, 18 Dec 2015 12:27:27 +0100
Subject: [PATCH] Fix parsing of CPPUNIT_IGNORE for Windows by allowing space
 in the test name. Now, in the list, each test name should be separated by a
 comma instead of a space.

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
---
 CppUnit/src/TextTestResult.cpp |  5 +++--
 travis/runtests.sh             | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CppUnit/src/TextTestResult.cpp b/CppUnit/src/TextTestResult.cpp
index b77318941..25d74c65f 100644
--- a/CppUnit/src/TextTestResult.cpp
+++ b/CppUnit/src/TextTestResult.cpp
@@ -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);
 		}
 	}
diff --git a/travis/runtests.sh b/travis/runtests.sh
index e38a6aca2..05b69b0bc 100755
--- a/travis/runtests.sh
+++ b/travis/runtests.sh
@@ -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:.