You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ni...@apache.org on 2010/11/09 09:15:18 UTC
svn commit: r1032885 -
/hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh
Author: nigel
Date: Tue Nov 9 08:15:18 2010
New Revision: 1032885
URL: http://svn.apache.org/viewvc?rev=1032885&view=rev
Log:
ZOOKEEPER-926. Fork Hadoop common's test-patch.sh and modify for Zookeeper. Updated test-patch.sh. Contributed by nigel.
Modified:
hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh
Modified: hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh?rev=1032885&r1=1032884&r2=1032885&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh (original)
+++ hadoop/zookeeper/trunk/src/java/test/bin/test-patch.sh Tue Nov 9 08:15:18 2010
@@ -150,9 +150,6 @@ setup () {
$patchURL
against trunk revision ${SVN_REVISION}."
- ### Copy in any supporting files needed by this process
- cp -r $SUPPORT_DIR/lib/* ./lib
- #PENDING: cp -f $SUPPORT_DIR/etc/checkstyle* ./src/test
### Copy the patch file to $PATCH_DIR
else
VERSION=PATCH-${defect}
@@ -181,8 +178,8 @@ setup () {
echo "======================================================================"
echo ""
echo ""
- echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -D${PROJECT_NAME}PatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
+ echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
+ $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" $ECLIPSE_PROPERTY -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
echo "Trunk compilation is broken?"
cleanupAndExit 1
@@ -253,15 +250,6 @@ checkTests () {
return 0
}
-cleanUpXml () {
- cd $BASEDIR/conf
- for file in `ls *.xml.template`
- do
- rm -f `basename $file .template`
- done
- cd $BASEDIR
-}
-
###############################################################################
### Attempt to apply the patch
applyPatch () {
@@ -492,13 +480,9 @@ runCoreTests () {
### Kill any rogue build processes from the last attempt
$PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
- PreTestTarget=""
- if [[ $defect == MAPREDUCE-* ]] ; then
- PreTestTarget="create-c++-configure"
- fi
- echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DZookeeperPatchProcess= -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}" -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME $PreTestTarget test-core
+ echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core"
+ $ANT_HOME/bin/ant -Dversion="${VERSION}" -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
@@ -657,9 +641,6 @@ setup
checkAuthor
RESULT=$?
-if [[ $HUDSON == "true" ]] ; then
- cleanUpXml
-fi
checkTests
(( RESULT = RESULT + $? ))
applyPatch