|
12 | 12 | <path id="class.path.test"> |
13 | 13 | <path refid="class.path"/> |
14 | 14 | <pathelement location="bin/"/> |
15 | | - <pathelement path="test-lib/junit-4.11.jar"/> |
| 15 | + <fileset dir="test-lib"> |
| 16 | + <include name="*.jar"/> |
| 17 | + </fileset> |
16 | 18 | </path> |
17 | 19 |
|
18 | 20 | <target name="clean" description="Clean the build directories"> |
|
46 | 48 | <fail if="windows" unless="java_home" |
47 | 49 | 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." /> |
48 | 50 |
|
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 | + --> |
55 | 67 | <javac source="1.5" target="1.5" |
56 | 68 | srcdir="src" |
57 | 69 | destdir="bin" |
|
82 | 94 | <fileset dir="test" includes="**/*.properties" /> |
83 | 95 | </copy> |
84 | 96 |
|
85 | | - <junit printsummary="yes"> |
| 97 | + <junit printsummary="yes" dir="${work.dir}" fork="true"> |
| 98 | + <jvmarg value="-Djava.library.path=lib/"/> |
86 | 99 | <classpath> |
87 | 100 | <pathelement location="bin"/> |
88 | 101 | <pathelement location="test-bin"/> |
|
94 | 107 | <batchtest fork="yes" todir="test-bin"> |
95 | 108 | <fileset dir="test"> |
96 | 109 | <include name="**/*Test.java"/> |
| 110 | + <exclude name="**/Abstract*.java"/> |
97 | 111 | </fileset> |
98 | 112 | </batchtest> |
99 | 113 | </junit> |
|
0 commit comments