Browse Source

HADOOP-6137. Fix project specific test-patch requirements

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@792440 13f79535-47bb-0310-9956-ffa450edef68
Giridharan Kesavan 16 years ago
parent
commit
127254f4a5
2 changed files with 10 additions and 3 deletions
  1. 3 0
      CHANGES.txt
  2. 7 3
      src/test/bin/test-patch.sh

+ 3 - 0
CHANGES.txt

@@ -871,6 +871,9 @@ Trunk (unreleased changes)
     HADOOP-6131. A sysproperty should not be set unless the property 
     HADOOP-6131. A sysproperty should not be set unless the property 
     is set on the ant command line in build.xml (hong tang via mahadev)
     is set on the ant command line in build.xml (hong tang via mahadev)
 
 
+    HADOOP-6137. Fix project specific test-patch requirements
+    (Giridharan Kesavan)
+
 Release 0.20.1 - Unreleased
 Release 0.20.1 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 7 - 3
src/test/bin/test-patch.sh

@@ -473,10 +473,14 @@ runCoreTests () {
   echo ""
   echo ""
   
   
   ### Kill any rogue build processes from the last attempt
   ### Kill any rogue build processes from the last attempt
-  $PS -auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /usr/bin/kill -9 {} > /dev/null
+  $PS auxwww | $GREP HadoopPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /usr/bin/kill -9 {} > /dev/null
+  PreTestTarget=""
+  if [[ $defect == MAPREDUCE-* ]] ; then
+     PreTestTarget="create-c++-configure"
+  fi
 
 
-  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure test-core"
-  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME create-c++-configure test-core
+  echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core"
+  $ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
   if [[ $? != 0 ]] ; then
   if [[ $? != 0 ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT
     JIRA_COMMENT="$JIRA_COMMENT