Skip to content

Commit f0087ed

Browse files
author
Federico Fissore
committed
testing via ant failed, now fixed (see #1288)
1 parent 7d63891 commit f0087ed

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

app/build.xml

+22-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<path id="class.path.test">
1313
<path refid="class.path"/>
1414
<pathelement location="bin/"/>
15-
<pathelement path="test-lib/junit-4.11.jar"/>
15+
<fileset dir="test-lib">
16+
<include name="*.jar"/>
17+
</fileset>
1618
</path>
1719

1820
<target name="clean" description="Clean the build directories">
@@ -46,12 +48,22 @@
4648
<fail if="windows" unless="java_home"
4749
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." />
4850

49-
<!--
50-
<dirname property="blah" file="${java.home}" />
51-
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
52-
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
53-
<fail />
54-
-->
51+
<condition property="work.dir" value="../build/linux/work/">
52+
<os family="unix"/>
53+
</condition>
54+
<condition property="work.dir" value="../build/windows/work/">
55+
<os family="windows"/>
56+
</condition>
57+
<condition property="work.dir" value="../build/macosx/work/">
58+
<os family="mac"/>
59+
</condition>
60+
61+
<!--
62+
<dirname property="blah" file="${java.home}" />
63+
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
64+
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
65+
<fail />
66+
-->
5567
<javac source="1.5" target="1.5"
5668
srcdir="src"
5769
destdir="bin"
@@ -82,7 +94,8 @@
8294
<fileset dir="test" includes="**/*.properties" />
8395
</copy>
8496

85-
<junit printsummary="yes">
97+
<junit printsummary="yes" dir="${work.dir}" fork="true">
98+
<jvmarg value="-Djava.library.path=lib/"/>
8699
<classpath>
87100
<pathelement location="bin"/>
88101
<pathelement location="test-bin"/>
@@ -94,6 +107,7 @@
94107
<batchtest fork="yes" todir="test-bin">
95108
<fileset dir="test">
96109
<include name="**/*Test.java"/>
110+
<exclude name="**/Abstract*.java"/>
97111
</fileset>
98112
</batchtest>
99113
</junit>

0 commit comments

Comments
 (0)