From 21284e8b46a517e66a4a1bf4f9de3a6b19ae27c6 Mon Sep 17 00:00:00 2001
From: Antonio Cunei <antonio.cunei@epfl.ch>
Date: Thu, 8 Apr 2010 20:57:55 +0000
Subject: Merged revisions 21372,21374-21375,21378-21383 ...

Merged revisions 21372,21374-21375,21378-21383 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21372 | extempore | 2010-04-07 17:50:16 +0200 (Wed, 07 Apr 2010) | 3 lines

  Tore out some unnecessary ambiguity-creating aliases in the XML
package object. I have a feeling we'll be traversing this kind of
territory again. Closes #3264, no review. ........ r21374 | extempore |
2010-04-07 21:06:52 +0200 (Wed, 07 Apr 2010) | 10 lines

  Created a test.suite.clean.checkinit ant target which:

    runs ant all.clean
    builds with -Xcheckinit
    runs the test suite with -Xcheckinit

  Review by cunei? If the nightly is trying to do the above sequence
with command line options, I suggest it be changed to run this target or
a similar one so the logic is not separated from the buildfile. ........
r21375 | extempore | 2010-04-07 21:23:08 +0200 (Wed, 07 Apr 2010) | 4
lines

  Gave Stream a lazy withFilter implementation. Now you too can have a
collection containing all the even numbers in the universe and still be
home in time for tea. Threw in some Stream cleanups for free. Closes
#3265, review by community. ........ r21378 | prokopec | 2010-04-08
14:04:55 +0200 (Thu, 08 Apr 2010) | 1 line

  Some typos in collections. Review by odersky.
........
  r21379 | prokopec | 2010-04-08 15:05:33 +0200 (Thu, 08 Apr 2010) | 1 line

  Mostly some undocumented stuff in JavaConversions. Review by
milessabin. ........ r21380 | dubochet | 2010-04-08 15:20:58 +0200 (Thu,
08 Apr 2010) | 1 line

  [scaladoc] Fixed filter method in template page (inherited filtering
works again). No review. Fixed whitespace in sources. ........ r21381 |
prokopec | 2010-04-08 16:16:31 +0200 (Thu, 08 Apr 2010) | 1 line

  Another set of typos fixed. Scan* added to TraversableMethods
interface. Review by odersky. ........ r21382 | prokopec | 2010-04-08
18:09:24 +0200 (Thu, 08 Apr 2010) | 1 line

  More cleanups in docs. Review by odersky.
........
  r21383 | extempore | 2010-04-08 20:12:34 +0200 (Thu, 08 Apr 2010) | 1 line

  Fix and test for Iterator corner case. Closes #3269, no review.
........
---
 build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index efaa1941da..e3f41a098d 100644
--- a/build.xml
+++ b/build.xml
@@ -1504,6 +1504,14 @@ BOOTRAPING TEST AND TEST SUITE
     </same>
   </target>
 
+  <target name="test.suite.clean.checkinit">
+	<antcall target="all.clean" />
+	<antcall target="test.suite" inheritAll="false">
+      <param name="scalac.args.optimise" value="-Xcheckinit" />
+      <param name="partest.scalacopts" value="-Xcheckinit" />
+    </antcall>
+  </target>
+
   <target name="test.suite" depends="pack.done">
 	<partest classpathref="pack.classpath">
 	  <env key="PATH" path="${build-pack.dir}/bin:${env.PATH}" />
-- 
cgit v1.2.3