Author: eli
Date: Wed Aug 1 21:30:06 2012
New Revision: 1368259
URL: http://svn.apache.org/viewvc?rev=1368259&view=rev
Log:
HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin
Patrick McCabe
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1368259&r1=1368258&r2=1368259&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml Wed
Aug 1 21:30:06 2012
@@ -227,6 +227,9 @@ http://maven.apache.org/xsd/maven-4.0.0.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
<executions>
<execution>
<id>compile-proto</id>
@@ -420,11 +423,17 @@ http://maven.apache.org/xsd/maven-4.0.0.
<target>
<property name="compile_classpath"
refid="maven.compile.classpath"/>
<property name="test_classpath"
refid="maven.test.classpath"/>
- <exec
executable="${project.build.directory}/native/test_libhdfs_threaded"
dir="${project.build.directory}/native/" failonerror="true">
+ <exec executable="sh" failonerror="true"
dir="${project.build.directory}/native/">
+ <arg value="-c"/>
+ <arg value="[ x$SKIPTESTS = xtrue ] ||
${project.build.directory}/native/test_libhdfs_threaded"/>
<env key="CLASSPATH"
value="${test_classpath}:${compile_classpath}"/>
+ <env key="SKIPTESTS" value="${skipTests}"/>
</exec>
- <exec
executable="${project.build.directory}/native/test_native_mini_dfs"
dir="${project.build.directory}/native/" failonerror="true">
+ <exec executable="sh" failonerror="true"
dir="${project.build.directory}/native/">
+ <arg value="-c"/>
+ <arg value="[ x$SKIPTESTS = xtrue ] ||
${project.build.directory}/native/test_libhdfs_threaded"/>
<env key="CLASSPATH"
value="${test_classpath}:${compile_classpath}"/>
+ <env key="SKIPTESTS" value="${skipTests}"/>
</exec>
</target>
</configuration>
