diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-10-17 10:34:04 +0000 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-10-17 10:34:04 +0000 |
| commit | 06c008c2fba30a5165147686c9e677e4a69f9987 (patch) | |
| tree | e15b5eaf4ac1af910643fcedfd56cfb4f4c104b4 | |
| parent | 74542ad91f5d51d8024316f672e7e33320ef7f22 (diff) | |
| download | vaadin-framework-06c008c2fba30a5165147686c9e677e4a69f9987.tar.gz vaadin-framework-06c008c2fba30a5165147686c9e677e4a69f9987.zip | |
Improved escaping of error messages passed to teamcity
svn changeset:21713/svn branch:6.7
| -rw-r--r-- | tests/integration_tests.xml | 10 |
1 files 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>
|