You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2017/07/10 18:39:35 UTC
svn commit: r1801510 - /pivot/jenkins/build.xml
Author: rwhitcomb
Date: Mon Jul 10 18:39:35 2017
New Revision: 1801510
URL: http://svn.apache.org/viewvc?rev=1801510&view=rev
Log:
Try using "classpathref" for JUnit tests in the build requirements check
to see if this has any effect on the Jenkins build problems.
Modified:
pivot/jenkins/build.xml
Modified: pivot/jenkins/build.xml
URL: http://svn.apache.org/viewvc/pivot/jenkins/build.xml?rev=1801510&r1=1801509&r2=1801510&view=diff
==============================================================================
--- pivot/jenkins/build.xml (original)
+++ pivot/jenkins/build.xml Mon Jul 10 18:39:35 2017
@@ -61,6 +61,8 @@ limitations under the License.
<target name="check" description="Check environment" depends="help">
<sequential>
+ <echo message="Using CLASSPATH=${classpath.general}"/>
+
<!-- Ant version check -->
<fail>
<condition>
@@ -75,9 +77,7 @@ limitations under the License.
file for more information.
]]>
</fail>
- </sequential>
- <sequential>
<!-- JDK version check -->
<fail>
<condition>
@@ -101,12 +101,8 @@ limitations under the License.
<condition>
<not>
<and>
- <available classname="org.junit.Test">
- <classpath refid="classpath.general" />
- </available>
- <hasmethod classname="org.junit.Assert" method="assertNotEquals">
- <classpath refid="classpath.general" />
- </hasmethod>
+ <available classname="org.junit.Test" classpathref="classpath.general" />
+ <hasmethod classname="org.junit.Assert" method="assertNotEquals" classpathref="classpath.general" />
</and>
</not>
</condition>