testing via ant failed (see #1288)

This commit is contained in:
Federico Fissore 2013-02-20 10:28:57 +01:00
parent f0087ed0e7
commit 19d8e24eeb
1 changed files with 22 additions and 5 deletions

View File

@ -48,14 +48,29 @@
<fail if="windows" unless="java_home"
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_18." />
<condition property="work.dir" value="../build/linux/work/">
<os family="unix"/>
<condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
<os family="mac"/>
</condition>
<condition property="java.library.path" value=".">
<os family="mac"/>
</condition>
<condition property="java.additional.jvmargs" value="-d32">
<os family="mac"/>
</condition>
<condition property="work.dir" value="../build/windows/work/">
<os family="windows"/>
</condition>
<condition property="work.dir" value="../build/macosx/work/">
<os family="mac"/>
<condition property="java.library.path" value=".">
<os family="windows"/>
</condition>
<condition property="java.additional.jvmargs" value="-d32">
<os family="windows"/>
</condition>
<condition property="work.dir" value="../build/linux/work/">
<os family="unix"/>
</condition>
<condition property="java.library.path" value="lib">
<os family="unix"/>
</condition>
<!--
@ -95,10 +110,12 @@
</copy>
<junit printsummary="yes" dir="${work.dir}" fork="true">
<jvmarg value="-Djava.library.path=lib/"/>
<jvmarg value="-Djava.library.path=${java.library.path}"/>
<jvmarg value="${java.additional.jvmargs}"/>
<classpath>
<pathelement location="bin"/>
<pathelement location="test-bin"/>
<pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
<path refid="class.path.test"/>
</classpath>