MAPREDUCE-5991. native-task should not run unit tests if native profile is not enabled. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613072 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea9e5b7b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea9e5b7b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea9e5b7b Branch: refs/heads/trunk Commit: ea9e5b7baae34c7ba660681d1e5aceb9c1047e6f Parents: 6635180 Author: Binglin Chang <bch...@apache.org> Authored: Thu Jul 24 11:44:09 2014 +0000 Committer: Binglin Chang <bch...@apache.org> Committed: Thu Jul 24 11:44:09 2014 +0000 ---------------------------------------------------------------------- .../hadoop-mapreduce-client-common/pom.xml | 11 ++++++ .../hadoop-mapreduce-client-nativetask/pom.xml | 35 ++++++++++++++++---- hadoop-project/pom.xml | 6 ++++ 3 files changed, 45 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea9e5b7b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml index 7ef7d3b..48db5c8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml @@ -84,6 +84,17 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>test-compile</phase> + </execution> + </executions> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea9e5b7b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml index 40b6520..2cb483e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml @@ -63,6 +63,12 @@ <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-common</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -82,14 +88,7 @@ <include>**/buffer/Test*.java</include> <include>**/handlers/Test*.java</include> <include>**/serde/Test*.java</include> - <include>**/combinertest/*Test.java</include> - <include>**/compresstest/*Test.java</include> - <include>**/nonsorttest/*Test.java</include> - <include>**/kvtest/*Test.java</include> </includes> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/../hadoop-mapreduce-client-common/target/classes</additionalClasspathElement> - </additionalClasspathElements> </configuration> </plugin> </plugins> @@ -184,6 +183,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <properties> + <property> + <name>listener</name> + <value>org.apache.hadoop.test.TimedOutTestsListener</value> + </property> + </properties> + <includes> + <include>**/TestTaskContext.java</include> + <include>**/buffer/Test*.java</include> + <include>**/handlers/Test*.java</include> + <include>**/serde/Test*.java</include> + <include>**/combinertest/*Test.java</include> + <include>**/compresstest/*Test.java</include> + <include>**/nonsorttest/*Test.java</include> + <include>**/kvtest/*Test.java</include> + </includes> + </configuration> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea9e5b7b/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2dc83dd..947be86 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -136,6 +136,12 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-common</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> <version>${project.version}</version> </dependency>
