From 98de1d96e77a1c1aad237a8e5c6c63e21bcb5fc2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 10 Apr 2010 02:42:25 +0200
Subject: Fix: Use file.seperator (win32); Use java.home/bin/java

---
 make/build-junit.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'make/build-junit.xml')

diff --git a/make/build-junit.xml b/make/build-junit.xml
index 74cb30606..58e8e3b7f 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -98,15 +98,15 @@
             <property name="test.class.path" basedir="${classes}" relative="true" location="@{test.class.path.m}"/>
             <var name="test.class.fqn" unset="true"/>
             <pathconvert property="test.class.fqn">
-              <fileset file="${classes}/${test.class.path}"/>
+              <fileset file="${classes}${file.separator}${test.class.path}"/>
               <chainedmapper>
-                  <globmapper    from="${classes.path}/*" to="*"/> <!-- rel. -->
+                  <globmapper    from="${classes.path}${file.separator}*" to="*"/> <!-- rel. -->
                   <packagemapper from="*.class"           to="*"/> <!-- FQCN -->
               </chainedmapper>
             </pathconvert>
             <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/>
             <echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/>
-            <apply dir="." executable="java" 
+            <apply dir="." executable="${java.home}/bin/java" 
                  parallel="false" 
                  timeout="${batchtest.timeout}"
                  vmlauncher="false"
-- 
cgit v1.2.3