harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r691476 - in /harmony/enhanced/classlib/trunk/modules/concurrent: build.xml make/hyproperties.xml
Date Wed, 03 Sep 2008 02:44:27 GMT
Author: ndbeyer
Date: Tue Sep  2 19:44:27 2008
New Revision: 691476

URL: http://svn.apache.org/viewvc?rev=691476&view=rev
Log:
fix test targets to execute tests in 'standard' folder

Modified:
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=691476&r1=691475&r2=691476&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Tue Sep  2 19:44:27 2008
@@ -61,7 +61,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="prepare-exclude" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests"
/>
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}.jar" />
@@ -77,8 +77,8 @@
 
         <mkdir dir="${hy.build}" />
 
-        <javac sourcepath=""
-               destdir="${hy.build}"
+        <javac destdir="${hy.build}"
+               sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -125,8 +125,7 @@
 
         <mkdir dir="${hy.concurrent.bin.test}" />
 
-        <javac srcdir="${hy.concurrent.src.test.java}"
-               destdir="${hy.concurrent.bin.test}"
+        <javac destdir="${hy.concurrent.bin.test}"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -190,6 +189,13 @@
                     <include name="**/*Test.java" unless="test.case" />
                     <excludesfile name="${concurrent.exclude.file}" unless="test.case"
/>
                 </fileset>
+                <fileset dir="${hy.concurrent.src.test.standard}">
+                    <!-- if ${test.case}     -->
+                    <include name="${converted.tc}" if="test.case" />
+                    <!-- unless ${test.case} -->
+                    <include name="**/*Test.java" unless="test.case" />
+                    <excludesfile name="${concurrent.exclude.file}" unless="test.case"
/>
+                </fileset>
             </batchtest>
         </junit>
         <antcall target="touch-failures-file" />

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml?rev=691476&r1=691475&r2=691476&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml Tue Sep  2 19:44:27
2008
@@ -21,10 +21,12 @@
       <src>
          <main>
             <java location="src/main/java" />
+            <standard location="standard/src/main/java" />
             <resources location="src/main/resources" />
          </main>
          <test>
             <java location="src/test/java" />
+            <standard location="standard/src/test/java" />
             <resources location="src/test/resources" />
          </test>
       </src>



Mime
View raw message