Skip to content

Commit 024dcf0

Browse files
author
Federico Fissore
committed
testing via ant failed (see #1288)
1 parent 19d8e24 commit 024dcf0

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

app/build.xml

+7-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
5252
<os family="mac"/>
5353
</condition>
54-
<condition property="java.library.path" value=".">
54+
<condition property="java.additional.library.path" value=".">
5555
<os family="mac"/>
5656
</condition>
5757
<condition property="java.additional.jvmargs" value="-d32">
@@ -60,7 +60,7 @@
6060
<condition property="work.dir" value="../build/windows/work/">
6161
<os family="windows"/>
6262
</condition>
63-
<condition property="java.library.path" value=".">
63+
<condition property="java.additional.library.path" value=".">
6464
<os family="windows"/>
6565
</condition>
6666
<condition property="java.additional.jvmargs" value="-d32">
@@ -69,7 +69,10 @@
6969
<condition property="work.dir" value="../build/linux/work/">
7070
<os family="unix"/>
7171
</condition>
72-
<condition property="java.library.path" value="lib">
72+
<condition property="java.additional.library.path" value="lib">
73+
<os family="unix"/>
74+
</condition>
75+
<condition property="java.additional.jvmargs" value="-Ddummy=0">
7376
<os family="unix"/>
7477
</condition>
7578

@@ -110,7 +113,7 @@
110113
</copy>
111114

112115
<junit printsummary="yes" dir="${work.dir}" fork="true">
113-
<jvmarg value="-Djava.library.path=${java.library.path}"/>
116+
<jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
114117
<jvmarg value="${java.additional.jvmargs}"/>
115118
<classpath>
116119
<pathelement location="bin"/>

0 commit comments

Comments
 (0)