Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To fix test targets 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/HADOOP-4687/core@780603 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Giridharan Kesavan 2009-06-01 09:54:21 +00:00
parent c984f6c77e
commit 01d81f4e51
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@ -139,11 +139,13 @@
<property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar" /> <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar" />
<!--this is the naming policy for artifacts we want pulled down--> <!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.module" location="hadoop-core" />
<property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/> <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
<!--this is how artifacts that get built are named--> <!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/> <property name="ivy.publish.pattern" value="hadoop-core-[revision].[ext]"/>
<property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" /> <property name="hadoop-core.jar" location="${build.dir}/${final.name}.jar" />
<property name="hadoop-core-test.jar" location="${build.dir}/${test.final.name}.jar" />
<!-- jdiff.home property set --> <!-- jdiff.home property set -->
<property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/> <property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@ -477,7 +479,7 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- Run unit tests --> <!-- Run unit tests -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="test-core" depends="compile-core-test" description="Run core unit tests"> <target name="run-test-core" depends="compile-core-test" description="Run core unit tests">
<delete dir="${test.build.data}"/> <delete dir="${test.build.data}"/>
<mkdir dir="${test.build.data}"/> <mkdir dir="${test.build.data}"/>
@ -534,7 +536,6 @@
</subant> </subant>
</target> </target>
<!--
<target name="test-core" description="Run core unit tests"> <target name="test-core" description="Run core unit tests">
<delete file="${test.build.dir}/testsfailed"/> <delete file="${test.build.dir}/testsfailed"/>
<property name="continueOnFailure" value="true"/> <property name="continueOnFailure" value="true"/>
@ -542,13 +543,8 @@
<available file="${test.build.dir}/testsfailed" property="testsfailed"/> <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
<fail if="testsfailed">Tests failed!</fail> <fail if="testsfailed">Tests failed!</fail>
</target> </target>
-->
<target name="test" depends="jar-test" description="Run all unit tests"> <target name="test" depends="jar-test,test-core" description="Run all unit tests">
<!--<property name="continueOnFailure" value="true"/> -->
<subant target="test-core" failonError="false">
<fileset dir="." includes="build.xml"/>
</subant>
<subant target="test-contrib"> <subant target="test-contrib">
<fileset dir="." includes="build.xml"/> <fileset dir="." includes="build.xml"/>
</subant> </subant>