[Jython-checkins] SF.net SVN: jython:[4970] branches/asm/build.xml

[<nr...@us...>]

Revision: 4970
          http://jython.svn.sourceforge.net/jython/?rev=4970&view=rev
Author:   nriley
Date:     2008-07-18 20:40:17 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Make ant regrtest work on Windows again.

Modified Paths:
--------------
    branches/asm/build.xml

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-07-18 19:21:37 UTC (rev 4969)
+++ branches/asm/build.xml	2008-07-18 20:40:17 UTC (rev 4970)
@@ -201,6 +201,15 @@
         <condition property="os.family.unix">
             <os family="unix"/>
         </condition>
+        <condition property="os.family.windows">
+            <os family="windows"/>
+        </condition>
+        <condition property="os.unix-or-cygwin">
+            <or>
+                <os family="unix"/>
+                <equals arg1="${OSNAME}" arg2="cygwin"/>
+            </or>
+        </condition>
     </target>
 
     <target name="full-preinit">
@@ -728,13 +737,21 @@
         <arg value="${dist.dir}"/>
       </exec>
     </target>
-    <target name="regrtest" depends="developer-build">
+    <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
+    <target name="regrtest-unix" if="os.unix-or-cygwin">
       <exec executable="${dist.dir}/bin/jython">
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>
       </exec>
     </target>
+    <target name="regrtest-windows" if="os.windows" unless="os.unix-or-cygwin">
+      <exec executable="${dist.dir}/bin/jython.bat">
+        <arg value="${dist.dir}/Lib/test/regrtest.py"/>
+        <!-- Only run the tests that are expected to work on Jython -->
+        <arg value="--expected"/>
+      </exec>
+    </target>
 
     <!-- run bugtests, create a config if necessary -->
     <target name="bugtest" depends="create-bugtest-config">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.