rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

testing via ant failed, now fixed (see #1288)

Browse Source
This commit is contained in:
Federico Fissore 2013-02-20 10:02:17 +01:00
parent 7d638910dd
commit f0087ed0e7
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/build.xml
View File

@ -12,7 +12,9 @@
<path id="class.path.test"> <path id="class.path.test">
<path refid="class.path"/> <path refid="class.path"/>
<pathelement location="bin/"/> <pathelement location="bin/"/>
<pathelement path="test-lib/junit-4.11.jar"/> <fileset dir="test-lib">
<include name="*.jar"/>
</fileset>
</path> </path>
<target name="clean" description="Clean the build directories"> <target name="clean" description="Clean the build directories">
@ -46,12 +48,22 @@
<fail if="windows" unless="java_home" <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." /> 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/">
<dirname property="blah" file="${java.home}" /> <os family="unix"/>
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" /> </condition>
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" /> <condition property="work.dir" value="../build/windows/work/">
<fail /> <os family="windows"/>
--> </condition>
<condition property="work.dir" value="../build/macosx/work/">
<os family="mac"/>
</condition>
<!--
<dirname property="blah" file="${java.home}" />
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
<fail />
-->
<javac source="1.5" target="1.5" <javac source="1.5" target="1.5"
srcdir="src" srcdir="src"
destdir="bin" destdir="bin"
@ -82,7 +94,8 @@
<fileset dir="test" includes="**/*.properties" /> <fileset dir="test" includes="**/*.properties" />
</copy> </copy>
<junit printsummary="yes"> <junit printsummary="yes" dir="${work.dir}" fork="true">
<jvmarg value="-Djava.library.path=lib/"/>
<classpath> <classpath>
<pathelement location="bin"/> <pathelement location="bin"/>
<pathelement location="test-bin"/> <pathelement location="test-bin"/>
@ -94,6 +107,7 @@
<batchtest fork="yes" todir="test-bin"> <batchtest fork="yes" todir="test-bin">
<fileset dir="test"> <fileset dir="test">
<include name="**/*Test.java"/> <include name="**/*Test.java"/>
<exclude name="**/Abstract*.java"/>
</fileset> </fileset>
</batchtest> </batchtest>
</junit> </junit>