You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ss...@apache.org on 2012/10/19 20:49:42 UTC
svn commit: r1400219 - in /hadoop/common/branches/MR-3902:
dev-support/test-patch.sh hadoop-project/pom.xml pom.xml
Author: sseth
Date: Fri Oct 19 18:49:38 2012
New Revision: 1400219
URL: http://svn.apache.org/viewvc?rev=1400219&view=rev
Log:
merge from trunk to branch MR-3902
Modified:
hadoop/common/branches/MR-3902/dev-support/test-patch.sh
hadoop/common/branches/MR-3902/hadoop-project/pom.xml
hadoop/common/branches/MR-3902/pom.xml
Modified: hadoop/common/branches/MR-3902/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/dev-support/test-patch.sh?rev=1400219&r1=1400218&r2=1400219&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/MR-3902/dev-support/test-patch.sh Fri Oct 19 18:49:38 2012
@@ -32,7 +32,7 @@ JENKINS=false
PATCH_DIR=/tmp
SUPPORT_DIR=/tmp
BASEDIR=$(pwd)
-
+BUILD_NATIVE=true
PS=${PS:-ps}
AWK=${AWK:-awk}
WGET=${WGET:-wget}
@@ -67,6 +67,7 @@ printUsage() {
echo "--forrest-home=<path> Forrest home directory (default FORREST_HOME environment variable)"
echo "--dirty-workspace Allow the local SVN workspace to have uncommitted changes"
echo "--run-tests Run all tests below the base directory"
+ echo "--build-native=<bool> If true, then build native components (default 'true')"
echo
echo "Jenkins-only options:"
echo "--jenkins Run by Jenkins (runs tests and posts results to JIRA)"
@@ -139,11 +140,18 @@ parseArgs() {
--run-tests)
RUN_TESTS=true
;;
+ --build-native=*)
+ BUILD_NATIVE=${i#*=}
+ ;;
*)
PATCH_OR_DEFECT=$i
;;
esac
done
+ if [[ $BUILD_NATIVE == "true" ]] ; then
+ NATIVE_PROFILE=-Pnative
+ REQUIRE_TEST_LIB_HADOOP=-Drequire.test.libhadoop
+ fi
if [ -z "$PATCH_OR_DEFECT" ]; then
printUsage
exit 1
@@ -437,8 +445,8 @@ checkJavacWarnings () {
echo "======================================================================"
echo ""
echo ""
- echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
- $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1
+ echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess $NATIVE_PROFILE -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
+ $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess $NATIVE_PROFILE -Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -707,8 +715,8 @@ runTests () {
if [[ $building_common -eq 0 ]]; then
echo " Building hadoop-common with -Pnative in order to provide \
libhadoop.so to the hadoop-hdfs unit tests."
- echo " $MVN compile -Pnative -D${PROJECT_NAME}PatchProcess"
- if ! $MVN compile -Pnative -D${PROJECT_NAME}PatchProcess; then
+ echo " $MVN compile $NATIVE_PROFILE -D${PROJECT_NAME}PatchProcess"
+ if ! $MVN compile $NATIVE_PROFILE -D${PROJECT_NAME}PatchProcess; then
JIRA_COMMENT="$JIRA_COMMENT
{color:red}-1 core tests{color}. Failed to build the native portion \
of hadoop-common prior to running the unit tests in $ordered_modules"
@@ -719,8 +727,8 @@ of hadoop-common prior to running the un
for module in $ordered_modules; do
cd $module
echo " Running tests in $module"
- echo " $MVN clean install -fn -Pnative -D${PROJECT_NAME}PatchProcess"
- $MVN clean install -fn -Pnative -Drequire.test.libhadoop -D${PROJECT_NAME}PatchProcess
+ echo " $MVN clean install -fn $NATIVE_PROFILE $REQUIRE_TEST_LIB_HADOOP -D${PROJECT_NAME}PatchProcess"
+ $MVN clean install -fn $NATIVE_PROFILE $REQUIRE_TEST_LIB_HADOOP -D${PROJECT_NAME}PatchProcess
module_failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E "<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-| |g" | sed -e "s|\.xml||g"`
# With -fn mvn always exits with a 0 exit code. Because of this we need to
# find the errors instead of using the exit code. We assume that if the build
Modified: hadoop/common/branches/MR-3902/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-project/pom.xml?rev=1400219&r1=1400218&r2=1400219&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/MR-3902/hadoop-project/pom.xml Fri Oct 19 18:49:38 2012
@@ -656,12 +656,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.cenqua.clover</groupId>
- <artifactId>clover</artifactId>
- <!-- Use the version needed by maven-clover-plugin -->
- <version>3.0.2</version>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.0.0</version>
@@ -731,11 +725,6 @@
<version>2.3.2</version>
</plugin>
<plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
@@ -909,54 +898,6 @@
<build.platform>Mac_OS_X-${sun.arch.data.model}</build.platform>
</properties>
</profile>
-
- <profile>
- <id>clover</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>clover</name>
- </property>
- </activation>
- <properties>
- <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation>
- <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <includesAllSourceRoots>true</includesAllSourceRoots>
- <includesTestSourceRoots>true</includesTestSourceRoots>
- <licenseLocation>${cloverLicenseLocation}</licenseLocation>
- <cloverDatabase>${cloverDatabase}</cloverDatabase>
- <targetPercentage>50%</targetPercentage>
- <outputDirectory>${project.build.directory}/clover</outputDirectory>
- <generateHtml>true</generateHtml>
- <generateXml>true</generateXml>
- </configuration>
- <executions>
- <execution>
- <id>clover-setup</id>
- <phase>process-sources</phase>
- <goals>
- <goal>setup</goal>
- </goals>
- </execution>
- <execution>
- <id>clover</id>
- <phase>test</phase>
- <goals>
- <goal>clover</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>test-patch</id>
<activation>
Modified: hadoop/common/branches/MR-3902/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/pom.xml?rev=1400219&r1=1400218&r2=1400219&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/pom.xml (original)
+++ hadoop/common/branches/MR-3902/pom.xml Fri Oct 19 18:49:38 2012
@@ -23,6 +23,17 @@ xsi:schemaLocation="http://maven.apache.
<name>Apache Hadoop Main</name>
<packaging>pom</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.cenqua.clover</groupId>
+ <artifactId>clover</artifactId>
+ <!-- Use the version needed by maven-clover-plugin -->
+ <version>3.0.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<distributionManagement>
<repository>
<id>apache.staging.https</id>
@@ -243,6 +254,11 @@ xsi:schemaLocation="http://maven.apache.
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -483,6 +499,52 @@ xsi:schemaLocation="http://maven.apache.
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>clover</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>clover</name>
+ </property>
+ </activation>
+ <properties>
+ <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation>
+ <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <includesAllSourceRoots>true</includesAllSourceRoots>
+ <includesTestSourceRoots>true</includesTestSourceRoots>
+ <licenseLocation>${cloverLicenseLocation}</licenseLocation>
+ <cloverDatabase>${cloverDatabase}</cloverDatabase>
+ <targetPercentage>50%</targetPercentage>
+ <outputDirectory>${project.build.directory}/clover</outputDirectory>
+ <generateHtml>true</generateHtml>
+ <generateXml>true</generateXml>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clover-setup</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>setup</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>clover</id>
+ <phase>test</phase>
+ <goals>
+ <goal>clover</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>