From 06c008c2fba30a5165147686c9e677e4a69f9987 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 17 Oct 2011 10:34:04 +0000
Subject: Improved escaping of error messages passed to teamcity

svn changeset:21713/svn branch:6.7
---
 tests/integration_tests.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 31e7847d68..9217190499 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -333,10 +333,12 @@
 				<antcall target="do-run-generic-test" />
 			</try>
 			<catch>
-				<!-- Should also perform other escaping - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
-				<!-- Also, the first escaped message may override any later ones (Ant properties are immutable) -->
-				<propertyregex property="tried-escaped" input="${tried}" regexp="\\n" replace="|n" global="true" />
-				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
+				<!-- Should also perform other escaping (\u0085, \u2028 and \u2029) - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
+				<!-- Immutable properties -> needs to create a new one every time -->
+				<propertyregex property="tried-escaped1" input="${tried}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${tried}" />
+				<propertyregex property="tried-escaped2" input="${tried-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${tried-escaped1}" />
+				<propertyregex property="tried-escaped3" input="${tried-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${tried-escaped2}" />
+				<concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped3}']"</concat>
 			</catch>
 		</trycatch>
 		<concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
-- 
cgit v1.2.3