dain 2004/09/08 14:20:51
Modified: modules/itests maven.xml
Log:
Fixed test failure detection... for some reason jelly doesn't like the 'or' or '||'
operators
Revision Changes Path
1.10 +8 -2 openejb/modules/itests/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 8 Sep 2004 17:08:30 -0000 1.9
+++ maven.xml 8 Sep 2004 18:20:51 -0000 1.10
@@ -163,7 +163,13 @@
<!-- call our teardown code -->
<attainGoal name="itest:teardown"/>
- <j:if test="${exception != null or itest.failure == 'false'}">
+ <j:if test="${exception != null}">
+ <j:if test="${context.getVariable('itest.failure.ignore') !=
'true'}">
+ <fail message="There was an exception from the tests."/>
+ </j:if>
+ </j:if>
+
+ <j:if test="${itest.failure}">
<j:if test="${context.getVariable('itest.failure.ignore') !=
'true'}">
<fail message="There were test failures."/>
</j:if>
