svn commit: r1518361 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java

[us...@apache.org]

Author: uschindler
Date: Wed Aug 28 20:22:13 2013
New Revision: 1518361

URL: http://svn.apache.org/r1518361
Log:
Merged revision(s) 1518354 from lucene/dev/trunk:
LUCENE-5190: Fix failure of TestCheckIndex.testLuceneConstantVersion in Jenkins trunk clover build and other builds using -Ddev.version.suffix

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=1518361&r1=1518360&r2=1518361&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java Wed Aug 28 20:22:13 2013
@@ -117,8 +117,10 @@ public class TestCheckIndex extends Luce
 
   public void testLuceneConstantVersion() throws IOException {
     // common-build.xml sets lucene.version
-    final String version = System.getProperty("lucene.version");
+    String version = System.getProperty("lucene.version");
     assertNotNull( "null version", version);
+    // remove anything after a "-" from the version string:
+    version = version.replaceAll("-.*$", "");
     final String constantVersion;
     String parts[] = Constants.LUCENE_MAIN_VERSION.split("\\.");
     if (parts.length == 4) {
@@ -130,7 +132,6 @@ public class TestCheckIndex extends Luce
       constantVersion = Constants.LUCENE_MAIN_VERSION;
     }
     assertTrue("Invalid version: "+version,
-               version.equals(constantVersion+"-SNAPSHOT") ||
                version.equals(constantVersion));
     assertTrue(Constants.LUCENE_VERSION + " should start with: "+version,
                Constants.LUCENE_VERSION.startsWith(version));