|
Lines 1067-1072
Link Here
|
| 1067 |
</javac> |
1067 |
</javac> |
| 1068 |
</target> |
1068 |
</target> |
| 1069 |
|
1069 |
|
|
|
1070 |
<!-- Default JUnit formatter log output --> |
| 1071 |
<property name="junit.formatter.type" value="plain"/> |
| 1072 |
<property name="junit.formatter.extension" value=".txt"/> |
| 1073 |
|
| 1070 |
<target name="test" description="Runs the JUnit test cases" |
1074 |
<target name="test" description="Runs the JUnit test cases" |
| 1071 |
depends="test-bio,test-nio,test-apr" > |
1075 |
depends="test-bio,test-nio,test-apr" > |
| 1072 |
<fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' /> |
1076 |
<fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' /> |
|
Lines 1076-1095
Link Here
|
| 1076 |
<target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors." |
1080 |
<target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors." |
| 1077 |
depends="test-compile,deploy" if="${execute.test.bio}"> |
1081 |
depends="test-compile,deploy" if="${execute.test.bio}"> |
| 1078 |
<runtests protocol="org.apache.coyote.http11.Http11Protocol" |
1082 |
<runtests protocol="org.apache.coyote.http11.Http11Protocol" |
| 1079 |
extension=".BIO.txt" /> |
1083 |
extension=".BIO" /> |
| 1080 |
</target> |
1084 |
</target> |
| 1081 |
|
1085 |
|
| 1082 |
<target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors." |
1086 |
<target name="test-nio" description="Runs the JUnit test cases for NIO. Does not stop on errors." |
| 1083 |
depends="test-compile,deploy" if="${execute.test.nio}"> |
1087 |
depends="test-compile,deploy" if="${execute.test.nio}"> |
| 1084 |
<runtests protocol="org.apache.coyote.http11.Http11NioProtocol" |
1088 |
<runtests protocol="org.apache.coyote.http11.Http11NioProtocol" |
| 1085 |
extension=".NIO.txt" /> |
1089 |
extension=".NIO" /> |
| 1086 |
</target> |
1090 |
</target> |
| 1087 |
|
1091 |
|
| 1088 |
<target name="test-apr" description="Runs the JUnit test cases for APR. Does not stop on errors." |
1092 |
<target name="test-apr" description="Runs the JUnit test cases for APR. Does not stop on errors." |
| 1089 |
depends="test-compile,deploy,test-apr-exists" |
1093 |
depends="test-compile,deploy,test-apr-exists" |
| 1090 |
if="${apr.exists}"> |
1094 |
if="${apr.exists}"> |
| 1091 |
<runtests protocol="org.apache.coyote.http11.Http11AprProtocol" |
1095 |
<runtests protocol="org.apache.coyote.http11.Http11AprProtocol" |
| 1092 |
extension=".APR.txt" /> |
1096 |
extension=".APR" /> |
| 1093 |
</target> |
1097 |
</target> |
| 1094 |
|
1098 |
|
| 1095 |
<target name="test-apr-exists" description="Checks for APR lib" |
1099 |
<target name="test-apr-exists" description="Checks for APR lib" |
|
Lines 1122-1128
Link Here
|
| 1122 |
<sysproperty key="tomcat.test.protocol" value="@{protocol}" /> |
1126 |
<sysproperty key="tomcat.test.protocol" value="@{protocol}" /> |
| 1123 |
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" /> |
1127 |
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" /> |
| 1124 |
|
1128 |
|
| 1125 |
<formatter type="plain" usefile="true" extension="@{extension}"/> |
1129 |
<formatter type="${junit.formatter.type}" usefile="true" extension="@{extension}${junit.formatter.extension}"/> |
| 1126 |
|
1130 |
|
| 1127 |
<!-- If test.entry is defined, run a single test, otherwise run all valid tests --> |
1131 |
<!-- If test.entry is defined, run a single test, otherwise run all valid tests --> |
| 1128 |
<test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/> |
1132 |
<test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/> |