From d6753d1eda95a94dc8f5fb67ada51e38f104916e Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Mon, 23 Oct 2006 17:49:33 +0000
Subject: separated constrs/defs tables for primitive typ...

separated constrs/defs tables for primitive types in DocGenerator.scala
---
 test/files/ant/test-build.xml | 8 +++++---
 test/files/ant/test.check     | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'test/files/ant')

diff --git a/test/files/ant/test-build.xml b/test/files/ant/test-build.xml
index aae3503385..7d28eccb47 100644
--- a/test/files/ant/test-build.xml
+++ b/test/files/ant/test-build.xml
@@ -93,6 +93,8 @@ INITIALISATION
     </fail>
     <fail message="Scala library '${scala-compiler.lib}' is not available">
       <condition><not><and>
+        <available classname="scala.tools.ant.Scalac"
+                   classpath="${scala-compiler.lib}"/>
         <available classname="scala.tools.nsc.Main"
                    classpath="${scala-compiler.lib}"/>
         <available classname="scala.tools.util.StringOps"
@@ -131,9 +133,9 @@ BUILD
     />
     <dirname property="log.dir" file="${build.dir}"/>
     <replace
-      file="${log.dir}/test-ant.log"
-      token="${user.name}" 
-      value="USERNAME"
+      file="${log.dir}/${ant.project.name}-ant.log"
+      token="${log.dir}"
+      value="[...]/files/ant"
     />
   </target>
 
diff --git a/test/files/ant/test.check b/test/files/ant/test.check
index 16ecead7bc..6675558506 100644
--- a/test/files/ant/test.check
+++ b/test/files/ant/test.check
@@ -1,4 +1,4 @@
-Buildfile: /home/USERNAME/projects/scala-installer/dependencies/scala/test/files/ant/test-build.xml
+Buildfile: [...]/files/ant/test-build.xml
 
 quick.init:
 
@@ -9,5 +9,5 @@ installed.init:
 init:
 
 build:
-    [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
+    [mkdir] Created dir: [...]/files/ant/test-ant.obj
+   [scalac] Compiling 1 source file to [...]/files/ant/test-ant.obj
-- 
cgit v1.2.3