This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 65438df Report test status via a separate target.
65438df is described below
commit 65438df1f9fb0e754cd90047cd0b901ac6cb07d9
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jun 3 08:28:33 2019 +0100
Report test status via a separate target.
This allows the status to be regenerated from the logs directory as
required.
---
build.xml | 39 +++++----------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
diff --git a/build.xml b/build.xml
index 6e91e91..6d28b3f 100644
--- a/build.xml
+++ b/build.xml
@@ -1474,42 +1474,13 @@
<property name="junit.formatter.extension" value=".txt" />
<target name="test" description="Runs the JUnit test cases"
- depends="test-nio,test-nio2,test-apr,cobertura-report" >
- <fileset id="test.result.skippedtests" dir="${test.reports}"
includes="*.txt">
- <not>
- <contains text="Skipped: 0" />
- </not>
- </fileset>
- <fileset id="test.result.failedtests" dir="${test.reports}"
includes="*.txt">
- <not>
- <contains text="Failures: 0, Errors: 0" />
- </not>
- </fileset>
- <concat>
- <header>Testsuites with skipped tests:${line.separator}</header>
- <string>${toString:test.result.skippedtests}</string>
- <filterchain>
- <tokenfilter delimOutput="${line.separator}">
- <stringtokenizer delims=";"/>
- </tokenfilter>
- </filterchain>
- </concat>
- <concat>
- <header>Testsuites with failed tests:${line.separator}</header>
- <string>${toString:test.result.failedtests}</string>
- <filterchain>
- <tokenfilter delimOutput="${line.separator}">
- <stringtokenizer delims=";"/>
- </tokenfilter>
- </filterchain>
- </concat>
-
- <fail if="test.result.error" message='Some tests completed with an Error.
See ${tomcat.build}/logs for details, search for "ERROR".' />
- <fail if="test.result.failure" message='Some tests completed with a
Failure. See ${tomcat.build}/logs for details, search for "FAILED".' />
- </target>
+ depends="test-nio,test-nio2,test-apr,cobertura-report,test-status" />
<target name="test-only" description="Runs the JUnit test cases without
additional processing"
- depends="test-only-nio,test-only-nio2,test-only-apr" >
+ depends="test-only-nio,test-only-nio2,test-only-apr,test-status" />
+
+ <target name="test-status"
+ description="Analyses logs directory and reports on skipped tests,
test failures and test errors">
<fileset id="test.result.skippedtests" dir="${test.reports}"
includes="*.txt">
<not>
<contains text="Skipped: 0" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
