Author: gkesavan
Date: Thu Jul 9 08:10:18 2009
New Revision: 792440
URL: http://svn.apache.org/viewvc?rev=792440&view=rev
Log:
HADOOP-6137. Fix project specific test-patch requirements
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/test/bin/test-patch.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=792440&r1=792439&r2=792440&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Jul 9 08:10:18 2009
@@ -871,6 +871,9 @@
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)
+ HADOOP-6137. Fix project specific test-patch requirements
+ (Giridharan Kesavan)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/src/test/bin/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/test/bin/test-patch.sh?rev=792440&r1=792439&r2=792440&view=diff
==============================================================================
--- hadoop/common/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/common/trunk/src/test/bin/test-patch.sh Thu Jul 9 08:10:18 2009
@@ -473,10 +473,14 @@
echo ""
### 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
JIRA_COMMENT="$JIRA_COMMENT
