diff options
| -rwxr-xr-x | build/ide.xml | 7 | ||||
| -rw-r--r-- | common.xml | 3 | ||||
| -rw-r--r-- | uitest/integration_tests.xml | 25 |
3 files changed, 10 insertions, 25 deletions
diff --git a/build/ide.xml b/build/ide.xml index ab5749edaf..45130e9d01 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -11,8 +11,7 @@ <property name="gwt.user.super.src" location="${gwt.basedir}/user/super" /> <property name="work.dir" location="work" /> - <echo>Using gwt files from ${gwt.user.classes} and - ${gwt.dev.classes}</echo> + <echo>Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes}</echo> <ivy:resolve file="client-compiler/ivy.xml" conf="ide" /> <ivy:cachepath pathid="client-compiler.deps" conf="ide" /> @@ -103,9 +102,7 @@ <mkdir dir="${module.output.dir}" /> - <echo>Compiling ${module} to ${module.output.dir} with - parameters -logLevel TRACE -style ${style} -localWorkers - ${localWorkers} -strict ${extraParams}</echo> + <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams}</echo> <!--<ivy:resolve inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA"/> --> diff --git a/common.xml b/common.xml index 780b90d281..02473b4385 100644 --- a/common.xml +++ b/common.xml @@ -399,8 +399,7 @@ <fail unless="cs.src" message="No cs.src parameter given" /> <property name="result.dir.full" location="${result.dir}" /> <mkdir dir="${result.dir}" /> - <echo>##teamcity[importData type='checkstyle' - path='${result.dir.full}/checkstyle-errors.xml']</echo> + <echo>##teamcity[importData type='checkstyle' path='${result.dir.full}/checkstyle-errors.xml']</echo> <cs:checkstyle config="${cs.xml}" failOnViolation="false"> <fileset dir="${cs.src}" includes="**/*.java"> <exclude name="com/vaadin/sass/internal/parser/Parser.java" /> diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml index fbe29c395d..7497bb752e 100644 --- a/uitest/integration_tests.xml +++ b/uitest/integration_tests.xml @@ -391,8 +391,7 @@ </op> </op> </antcontrib:math> - <echo>Delaying startup of ${target-server} with - ${sleepTime} seconds</echo> + <echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo> <sleep seconds="${sleepTime}" /> </then> </antcontrib:if> @@ -488,8 +487,7 @@ </target> <target name="run-generic-integration-test"> - <concat>##teamcity[testStarted name='${target-server}' - flowId='${target-server}']</concat> + <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat> <antcontrib:trycatch property="tried"> <try> <antcall target="do-run-generic-test" /> @@ -499,14 +497,10 @@ <param name="returnTo" value="tried-escaped" /> <param name="message" value="${tried}" /> </antcontrib:antcallback> - <concat>##teamcity[testFailed name='${target-server}' - flowId='${target-server}' message='Integration test - for ${target-server} failed.' - details='${tried-escaped}']</concat> + <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat> </catch> </antcontrib:trycatch> - <concat>##teamcity[testFinished name='${target-server}' - flowId='${target-server}']"</concat> + <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat> </target> <target name="teamcity-escape"> @@ -523,8 +517,7 @@ </target> <target name="run-integration-test"> - <concat>##teamcity[testStarted name='${target-server}' - flowId='${target-server}']</concat> + <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat> <antcontrib:trycatch property="tried"> <try> <antcall target="integration-test-${target-server}" /> @@ -534,14 +527,10 @@ <param name="returnTo" value="tried-escaped" /> <param name="message" value="${tried}" /> </antcallback> - <concat>##teamcity[testFailed name='${target-server}' - flowId='${target-server}' message='Integration test - for ${target-server} failed.' - details='${tried-escaped}']"</concat> + <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat> </catch> </antcontrib:trycatch> - <concat>##teamcity[testFinished name='${target-server}' - flowId='${target-server}']"</concat> + <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat> </target> <target name="integration-test-get-lock"> |