Merged revisions 21777-21779,21783-21784,21787-...

Merged revisions 21777-21779,21783-21784,21787-21802 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21777 | dragos | 2010-05-02 19:41:59 +0200 (Sun, 02 May 2010) | 1 line

  Properly specialize superclasses of a specialized class. ........
r21778 | dragos | 2010-05-02 19:42:06 +0200 (Sun, 02 May 2010) | 1 line

  Closes #3382. no review.
........
  r21779 | dragos | 2010-05-02 19:42:10 +0200 (Sun, 02 May 2010) | 1 line

  Fixed private member access, closes #3380. no review. ........ r21783
| dragos | 2010-05-03 09:58:15 +0200 (Mon, 03 May 2010) | 2 lines

  Renamed Idea project files to have a .SAMPLE suffix. Having to
constantly remove them from each commit was too cumbersome. ........
r21784 | phaller | 2010-05-03 11:35:13 +0200 (Mon, 03 May 2010) | 1 line

  Increased partest per-test timeout in an attempt to fix the windows
nightly. ........ r21787 | dragos | 2010-05-04 11:34:50 +0200 (Tue, 04
May 2010) | 3 lines

  Removed 4-year old println when getModuleOrClass fails. It polluted
debug output when -Ydebug was present because now every (successful)
compiler run hits a few MissingRequirementErrors, quietly swallowed
by getModule2/getClass2. The errors are normal during the transition
to 'scala.collection.immutable.List' and 'scala.Seq/Sequence', while
definitions are built. No review. ........ r21788 | dragos | 2010-05-04
11:34:55 +0200 (Tue, 04 May 2010) | 1 line

  Closes #3378. No review.
........
  r21789 | dragos | 2010-05-04 11:34:58 +0200 (Tue, 04 May 2010) | 1 line

  Fixed abstract overrides of specialized methods. Closes #3379, no
review. Added test files for latest bug fixes. ........ r21790 | moors |
2010-05-04 15:53:09 +0200 (Tue, 04 May 2010) | 2 lines

  closes #3373, #3177: validity check of an implicit value should
consider the value as well as its accessor review by odersky ........
r21791 | rytz | 2010-05-04 16:01:58 +0200 (Tue, 04 May 2010) | 1 line

  fix and test where constructor parameter annotations end up. no review
........ r21792 | moors | 2010-05-04 16:03:47 +0200 (Tue, 04 May 2010) |
1 line

  sorry, last-minute edit broke build: re-added parens ........ r21793 |
moors | 2010-05-04 16:36:14 +0200 (Tue, 04 May 2010) | 6 lines

  Revert r21790: "closes #3373, #3177: validity check of an implicit   "
  value should consider the value as well as its accessor Revert       "
  r21792: "sorry, last-minute edit broke build: re-added parens        "

  will investigate how it broke and why my local pre-commit tests did
not catch the failure...

  no review
........
  r21794 | rytz | 2010-05-04 16:40:10 +0200 (Tue, 04 May 2010) | 1 line

  close #3384. cleaned up constructor defaults. see #3338 see #3344
see #2057 see #3207. no review ........ r21795 | phaller | 2010-05-04
16:54:57 +0200 (Tue, 04 May 2010) | 1 line

  Some more, hopefully temporary, partest timeout tweaks. No review.
........ r21796 | imaier | 2010-05-04 17:06:23 +0200 (Tue, 04 May 2010)
| 1 line

  Fixed #3274. No review.
........
  r21797 | odersky | 2010-05-04 18:00:15 +0200 (Tue, 04 May 2010) | 1 line

  Fixed StringBuilder#last performance problem.
........
  r21798 | moors | 2010-05-04 18:21:13 +0200 (Tue, 04 May 2010) | 2 lines

  revert commit that probably broke the build due to a bug in closure
elimination revert commit that reverted the commit that probably didn't
break the build ........ r21799 | dragos | 2010-05-04 18:59:28 +0200
(Tue, 04 May 2010) | 1 line

  Closes #3387. no review.
........
  r21800 | dragos | 2010-05-04 19:07:41 +0200 (Tue, 04 May 2010) | 1 line

  Fixed broken commit. no review.
........
  r21801 | extempore | 2010-05-04 20:33:41 +0200 (Tue, 04 May 2010) | 1 line

  Fix for #3391.  No review.
........
  r21802 | dragos | 2010-05-04 23:59:18 +0200 (Tue, 04 May 2010) | 1 line

  Fixing the conflict between the two private-related bugs, fixing the
build. no review. ........

1 files changed, 2 insertions, 2 deletions

diff --git a/build.xml b/build.xml
index 58373ea69b..4df52769ec 100644
--- a/build.xml
+++ b/build.xml
@@ -1503,8 +1503,8 @@ BOOTRAPING TEST AND TEST SUITE
     <partest classpathref="pack.classpath">
       <env key="PATH" path="${build-pack.dir}/bin:${env.PATH}" />
       <sysproperty key="partest.timeout" value="36000" />
-      <sysproperty key="partest.test-warning" value="300" />
-      <sysproperty key="partest.test-timeout" value="1800" />
+      <sysproperty key="partest.test-warning" value="600" />
+      <sysproperty key="partest.test-timeout" value="5400" />
       <sysproperty key="partest.srcdir" value="files" />
       <sysproperty key="partest.scalacopts" value="${scalac.args.all}" />
       <sysproperty key="partest.javacopts" value="${javac.args}" />