svn commit: r1622685 - /lucene/dev/trunk/lucene/common-build.xml

[us...@apache.org]

Author: uschindler
Date: Fri Sep  5 12:00:02 2014
New Revision: 1622685

URL: http://svn.apache.org/r1622685
Log:
LUCENE-5902: Simplify the property handling by having a default; only add explicitclass include if actually given; refactor filterchain (TODO: maybe use a one-line groovy for this, we already have groovy loaded before running tests...?)

Modified:
    lucene/dev/trunk/lucene/common-build.xml

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1622685&r1=1622684&r2=1622685&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Sep  5 12:00:02 2014
@@ -885,23 +885,23 @@
         <property name="tests.leaveTemporary" value="false" />
         <property name="tests.iters" value="" />
         <property name="tests.dups"  value="1" />
+        <property name="tests.useSecurityManager"  value="true" />
 
         <!-- turn on security manager? -->
         <condition property="java.security.manager" value="org.apache.lucene.util.TestSecurityManager">
-          <or>
-            <not>
-              <isset property="tests.useSecurityManager"/>
-            </not>
-            <istrue value="${tests.useSecurityManager}"/>
-          </or>
+          <istrue value="${tests.useSecurityManager}"/>
         </condition>
 
+        <!-- create a fileset pattern that matches ${tests.class}. -->
         <loadresource property="tests.explicitclass" quiet="true">
           <string value="${tests.class}" />
           <filterchain>
-            <replaceregex pattern="\." replace="/" flags="g" />
-            <replaceregex pattern="\*" replace="**" flags="g" />
-            <replaceregex pattern="$" replace=".class" />
+            <tokenfilter>
+              <filetokenizer/>
+              <replacestring from="." to="/"/>
+              <replacestring from="*" to="**"/>
+              <replaceregex pattern="$" replace=".class" />
+            </tokenfilter>
           </filterchain>
         </loadresource>
 
@@ -1158,7 +1158,7 @@
               <fileset dir="@{testsDir}">
                 <include name="**/Test*.class" />
                 <include name="**/*Test.class" />
-                <include name="${tests.explicitclass}" />
+                <include name="${tests.explicitclass}" if="tests.explicitclass" />
                 <exclude name="**/*$*" />
               </fileset>
             </junit4:duplicate>