diff options
| author | michelou <michelou@epfl.ch> | 2006-10-21 08:36:01 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-10-21 08:36:01 +0000 |
| commit | 52a66ee1f757cc4b23f3e476e9039f9769b24da6 (patch) | |
| tree | 1509120f984aadd6800186ebcebdf156b17a0d3d /test/files/ant | |
| parent | 615d92649f8aa0ee86f439cd0d2d67dc1afff172 (diff) | |
| download | scala-52a66ee1f757cc4b23f3e476e9039f9769b24da6.tar.gz scala-52a66ee1f757cc4b23f3e476e9039f9769b24da6.tar.bz2 scala-52a66ee1f757cc4b23f3e476e9039f9769b24da6.zip | |
improved ant test in test/scalatest
Diffstat (limited to 'test/files/ant')
| -rw-r--r-- | test/files/ant/test-build.xml | 9 | ||||
| -rw-r--r-- | test/files/ant/test.check | 8 |
2 files changed, 11 insertions, 6 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 |