brett 2004/01/26 14:58:21
Modified: src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
Log:
touchstone clean up, re-enable tests that now succeed
Revision Changes Path
No revision
No revision
1.43.4.5 +8 -19 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.4
retrieving revision 1.43.4.5
diff -u -r1.43.4.4 -r1.43.4.5
--- maven.xml 31 Dec 2003 01:16:33 -0000 1.43.4.4
+++ maven.xml 26 Jan 2004 22:58:21 -0000 1.43.4.5
@@ -140,7 +140,7 @@
</fail>
</j:if>
- <j:set var="checkValue"
value="${pom.getPluginContext('maven-touchstone-partner-plugin').getVariable('touchstone_partner_postGoal_C')}"/>
+ <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin"
property="touchstone_partner_postGoal_C"/>
<j:if test="${checkValue != 'true'}">
<fail message="">
@@ -164,7 +164,7 @@
</fail>
</j:if>
- <j:set var="checkValue"
value="${pom.getPluginContext('maven-touchstone-partner-plugin').getVariable('touchstone_partner_postGoal_D')}"/>
+ <maven:pluginVar var="checkValue" plugin="maven-touchstone-partner-plugin"
property="touchstone_partner_postGoal_D"/>
<j:if test="${checkValue != 'true'}">
<fail message="">
@@ -172,6 +172,7 @@
</fail>
</j:if>
+
<attainGoal name="test-mavenjellyscope"/>
<j:if test="${context.findVariable('test-mavenjellyscope') != 'success'}">
<fail>
@@ -191,16 +192,14 @@
<attainGoal name="test-postGoal-counter" />
<attainGoal name="test-reactor-resources" />
- <attainGoal name="test-reactor-run-twice" />
<attainGoal name="test-plugin-attainment-reactor" />
-
-<!-- TODO [RC2] - this is the cause of the current site problems
+ <attainGoal name="test-reactor-run-twice" />
<attainGoal name="test-context-switch" />
--->
-<!-- TODO - this is still broken
+<!-- TODO - this is still broken (as in RC1)
<attainGoal name="test-reactor-maven-username" />
-->
+ <echo>Touchstone complete</echo>
</goal>
<!--
@@ -574,18 +573,6 @@
</goal>
<!--
- | This preGoal test does NOT work at the moment. This is just a
- | reminder for me to get it working.
- | @todo use or remove
- |-->
-
- <preGoal name="test">
- <echo>
- PreGoal for 'test' was executed.
- </echo>
- </preGoal>
-
- <!--
| property wrongly treated as == null
| This test will fail until jexl(?) is fixed.
| @todo use or remove
@@ -696,6 +683,7 @@
</goal>
<preGoal name="counter-pre">
+ <echo>Counter PreGoal</echo>
<j:set var="counterPre" scope="parent" value="${counterPre + 1}" />
</preGoal>
@@ -712,6 +700,7 @@
</goal>
<postGoal name="counter-post">
+ <echo>Counter PostGoal</echo>
<j:set var="counterPost" scope="parent" value="${counterPost + 1}" />
</postGoal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
