You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by tu...@apache.org on 2012/10/19 07:30:31 UTC
svn commit: r1399971 -
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Author: tucu
Date: Fri Oct 19 05:30:30 2012
New Revision: 1399971
URL: http://svn.apache.org/viewvc?rev=1399971&view=rev
Log:
reverting commit 1399959 (HADOOP-8887 again)
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=1399971&r1=1399970&r2=1399971&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 Fri Oct 19 05:30:30 2012
@@ -294,6 +294,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>create-protobuf-generated-sources-directory</id>
@@ -496,58 +499,47 @@ http://maven.apache.org/xsd/maven-4.0.0.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
- <id>define-classpath</id>
- <phase>process-resources</phase>
+ <id>make</id>
+ <phase>compile</phase>
<goals><goal>run</goal></goals>
<configuration>
- <exportAntProperties>true</exportAntProperties>
- <tests>
- <property name="test.classpath" refid="maven.test.classpath"/>
- </tests>
+ <target>
+ <mkdir dir="${project.build.directory}/native"/>
+ <exec executable="cmake" dir="${project.build.directory}/native"
+ failonerror="true">
+ <arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_LIBWEBHDFS=${require.libwebhdfs} -DREQUIRE_FUSE=${require.fuse}"/>
+ </exec>
+ <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
+ <arg line="VERBOSE=1"/>
+ </exec>
+ </target>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
- <artifactId>cmake-ng</artifactId>
- <executions>
<execution>
- <id>cmake-compile</id>
- <goals><goal>compile</goal></goals>
- <configuration>
- <target>all</target>
- <source>${basedir}/src</source>
- <vars>
- <GENERATED_JAVAH>${project.build.directory}/native/javah</GENERATED_JAVAH>
- <JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
- <REQUIRE_FUSE>${require.fuse}</REQUIRE_FUSE>
- <REQUIRE_LIBWEBHDFS>${require.libwebhdfs}</REQUIRE_LIBWEBHDFS>
- </vars>
- </configuration>
- </execution>
- <execution>
- <id>test_libhdfs_threaded</id>
- <goals><goal>test</goal></goals>
- <configuration>
- <binary>${project.build.directory}/native/test_libhdfs_threaded</binary>
- <env><CLASSPATH>${test.classpath}</CLASSPATH></env>
- <timeout>300</timeout>
- <results>${project.build.directory}/results</results>
- </configuration>
- </execution>
- <execution>
- <id>test_native_mini_dfs</id>
- <goals><goal>test</goal></goals>
+ <id>native_tests</id>
+ <phase>test</phase>
+ <goals><goal>run</goal></goals>
<configuration>
- <binary>${project.build.directory}/native/test_native_mini_dfs</binary>
- <env><CLASSPATH>${test.classpath}</CLASSPATH></env>
- <timeout>300</timeout>
- <results>${project.build.directory}/results</results>
+ <target>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <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="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>
</execution>
</executions>