diff options
| -rw-r--r-- | test/files/ant/test-build.xml | 9 | ||||
| -rw-r--r-- | test/files/ant/test.check | 8 | ||||
| -rwxr-xr-x | test/scalatest | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/test/files/ant/test-build.xml b/test/files/ant/test-build.xml index a83c1f923e..aae3503385 100644 --- a/test/files/ant/test-build.xml +++ b/test/files/ant/test-build.xml @@ -34,6 +34,7 @@ PROPERTIES <echo level="verbose" message="binary=${binary}"/> <property name="build.dir" value="${java.io.tmpdir}/classes-${user.name}"/> + <echo level="verbose" message="build.dir=${build.dir}"/> <!-- =========================================================================== INITIALISATION @@ -120,7 +121,7 @@ BUILD ============================================================================ --> <target name="build" depends="init"> - <echo level="verbose" message="ouput.dir=${build.dir}"/> + <echo level="verbose" message="build.dir=${build.dir}"/> <mkdir dir="${build.dir}"/> <scalac srcdir="${source.dir}" @@ -128,6 +129,12 @@ BUILD destdir="${build.dir}" classpathref="build.classpath" /> + <dirname property="log.dir" file="${build.dir}"/> + <replace + file="${log.dir}/test-ant.log" + token="${user.name}" + value="USERNAME" + /> </target> <!-- =========================================================================== diff --git a/test/files/ant/test.check b/test/files/ant/test.check index 1c8d4552b5..16ecead7bc 100644 --- a/test/files/ant/test.check +++ b/test/files/ant/test.check @@ -1,4 +1,4 @@ -Buildfile: /home/michelou/projects/scala-installer/dependencies/scala/test/files/ant/test-build.xml +Buildfile: /home/USERNAME/projects/scala-installer/dependencies/scala/test/files/ant/test-build.xml quick.init: @@ -9,7 +9,5 @@ installed.init: init: build: - [scalac] Compiling 1 source file to /tmp/classes-michelou - -BUILD SUCCESSFUL -Total time: 3 seconds + [mkdir] Created dir: /home/USERNAME/projects/scala-installer/dependencies/scala/test/files/ant/test-ant.obj + [scalac] Compiling 1 source file to /home/USERNAME/projects/scala-installer/dependencies/scala/test/files/ant/test-ant.obj diff --git a/test/scalatest b/test/scalatest index 2382905705..e5cf16693c 100755 --- a/test/scalatest +++ b/test/scalatest @@ -286,7 +286,7 @@ test_run_ant() { testname=`basename "$srcbase"`; buildfile=`get_os_filename "$srcdir/$testname-build.xml"`; rm -rf "$dstbase".obj && - $ANT -f "$buildfile" -Dbinary "$BINARY" -D=output.dir "$os_dstbase".obj && + $ANT -f "$buildfile" -Dbinary="$BINARY" -Dbuild.dir="$os_dstbase".obj && rm -rf "$dstbase".obj; } |