diff options
| author | Artur Signell <artur@vaadin.com> | 2013-03-12 12:58:05 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-03-12 12:58:07 +0200 |
| commit | 0f3ac51ed4c34c9233463c1274c7107580faa1f9 (patch) | |
| tree | 11a1de6982ca79c96c787cf395fe4f1fc51deeb9 /scripts | |
| parent | 1853dea1b9277f2d5a8911bd2d20277158e221b7 (diff) | |
| parent | 6922bc5b49c5551b289a5025ccd5901e2ac3aafc (diff) | |
| download | vaadin-framework-0f3ac51ed4c34c9233463c1274c7107580faa1f9.tar.gz vaadin-framework-0f3ac51ed4c34c9233463c1274c7107580faa1f9.zip | |
Merge commit '6922bc5b49c5551b289a5025ccd5901e2ac3aafc'
Change-Id: Id118fd9bae1fdf7e7ce2efd660ade5ba7bbc5109
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/merge-check.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/merge-check.sh b/scripts/merge-check.sh index 9e0d5e1e75..e3adf39115 100755 --- a/scripts/merge-check.sh +++ b/scripts/merge-check.sh @@ -24,9 +24,7 @@ else echo $message echo "" $command - # Escape []|' and newline with | to make teamcity happy - details=`$command|sed "s/[]['\|]/|&/g"|perl -p -e 's/\n/|n/'` - echo "##teamcity[testFailed name='$testname' message='$message' details='|n$details']" + echo "##teamcity[testFailed name='$testname' message='$message']" fi echo "##teamcity[testFinished name='$testname']" |