You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by sa...@apache.org on 2012/02/21 16:02:29 UTC

svn commit: r1291838 - /lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh

Author: sarowe
Date: Tue Feb 21 15:02:28 2012
New Revision: 1291838

URL: http://svn.apache.org/viewvc?rev=1291838&view=rev
Log:
Don't insert @Ignore into BasicDistributedZkTest.java if it's already there

Modified:
    lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh

Modified: lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh
URL: http://svn.apache.org/viewvc/lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh?rev=1291838&r1=1291837&r2=1291838&view=diff
==============================================================================
--- lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh (original)
+++ lucene/dev/nightly/hudson-lucene-solr-maven-trunk.sh Tue Feb 21 15:02:28 2012
@@ -3,8 +3,12 @@
 
 export JAVA_HOME=$JAVA_HOME_16
 
-echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under Maven"
-perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;'\
-     $SOLR_DIR/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+PROBLEMATIC_TEST=$SOLR_DIR/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+
+# Don't insert @Ignore if it's already there
+if ! grep '@Ignore' $PROBLEMATIC_TEST >/dev/null ; then
+    echo ">>> Ignoring BasicDistributedZkTest, which always fails on Hudson trunk under Maven"
+    perl -pi.bak -e 's/(?=public class BasicDistributedZkTest)/import org.junit.Ignore;\n\@Ignore\n/;' $PROBLEMATIC_TEST
+fi
 
 . $WORKSPACE/nightly/common-maven.sh