svn commit: r1637755 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Sun Nov  9 22:23:25 2014
New Revision: 1637755

URL: http://svn.apache.org/r1637755
Log:
Merged revision(s) 1637754 from lucene/dev/trunk:
SOLR-5022: Reenable Hdfs tests on Java 8+, because they have no permgen. Windows is still disabled, because Hadoop needs Cygwin.

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_5x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/common-build.xml?rev=1637755&r1=1637754&r2=1637755&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/common-build.xml Sun Nov  9 22:23:25 2014
@@ -141,10 +141,16 @@
     </sequential>
   </macrodef>
 
-  <!-- we don't want to run HDFS tests on Windows, because they require Cygwin.
-    If you have Cygwin, you can override this property on command line: -->
+  <!-- 
+    - We don't test HDFS on Java 7 because it causes permgen errors. Java 8 no longer has permgen.
+    - We don't want to run HDFS tests on Windows, because they require Cygwin.
+    If you have Cygwin or manually raised permgen, you can override this property on command line:
+  -->
   <condition property="tests.disableHdfs" value="true">
-    <os family="windows"/>
+    <or>
+      <equals arg1="${build.java.runtime}" arg2="1.7"/>
+      <os family="windows"/>
+    </or>
   </condition>
 
   <target name="validate" depends="compile-tools">