diff options
| author | Michael Bien <[email protected]> | 2010-02-12 21:46:53 +0100 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-02-12 21:46:53 +0100 |
| commit | 3bdc000de6c220d6fc0676ddea4da67b46708092 (patch) | |
| tree | a78245931d95cbcfac84e35036847de3a21abf54 | |
| parent | eca540f632a80aa002d1c4304d73eaf4513ab27e (diff) | |
fixed jdk tools.jar classpath for hudson to fix tests.
| -rwxr-xr-x | make/build.xml | 6 | ||||
| -rw-r--r-- | test/junit/com/sun/gluegen/build.xml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index c7d3157..fd10542 100755 --- a/make/build.xml +++ b/make/build.xml @@ -574,8 +574,10 @@ <mkdir dir="${gluegen.root}/build/test/build/classes"/> <mkdir dir="${gluegen.root}/build/test/results"/> + <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> + <javac destdir="${gluegen.root}/build/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source"> - <classpath path="${gluegen.root}/make/lib/junit-4.5.jar:${gluegen.root}/build/classes:${gluegen.root}/build/test/gensrc/java:${jdk.home}/lib/tools.jar:${ant.core.lib}"/> + <classpath path="${gluegen.root}/make/lib/junit-4.5.jar:${gluegen.root}/build/classes:${gluegen.root}/build/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> </javac> <junit forkmode="once" showoutput="true" fork="true"> @@ -588,7 +590,7 @@ <formatter usefile="true" type="xml"/> </batchtest> <classpath> - <path path="${gluegen.root}/build/test/build/classes:${gluegen.root}/build/test/gensrc/java:${gluegen.root}/build/classes:${gluegen.root}/lib/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/> + <path path="${gluegen.root}/build/test/build/classes:${gluegen.root}/build/test/gensrc/java:${gluegen.root}/build/classes:${antlr.jar}:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/> </classpath> </junit> </target> diff --git a/test/junit/com/sun/gluegen/build.xml b/test/junit/com/sun/gluegen/build.xml index 08405bf..c52101e 100644 --- a/test/junit/com/sun/gluegen/build.xml +++ b/test/junit/com/sun/gluegen/build.xml @@ -16,16 +16,16 @@ <echo message=" - - - compiling java files - - - "/> <property name="build.dir.java" value="${build.dir}/classes"/> + <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> <echo message="src: ${src.dir} "/> <echo message="build: ${build.dir.java} "/> - <echo message="jdkhome: ${jdk.home} "/> <mkdir dir="${build.dir.java}"/> <javac destdir="${build.dir.java}" source="1.5" failonerror="true" debug="true" verbose="true" debuglevel="lines,vars,source"> <src path="${src.dir}"/> - <classpath path="${gluegen.root}/build/classes:${src.dir}:${gluegen.root}/build/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${jdk.home}/lib/tools.jar:${ant.core.lib}"/> + <classpath path="${gluegen.root}/build/classes:${src.dir}:${gluegen.root}/build/antlr-3.2.jar:${gluegen.root}/make/lib/junit-4.5.jar:${tools.jar}:${ant.core.lib}"/> </javac> <echo message=" - - - java files compiled - - - "/> |