diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-02 09:35:37 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-05-02 09:35:37 +0000 |
| commit | 4e4e1e4c759c14fbc45f92072b692fa3b9540ba0 (patch) | |
| tree | 3ba88bc75b71a3fe64f62a3bc8e6ac680abea09e /build.xml | |
| parent | 660683929b6346d7a316273c145c677db7118e7d (diff) | |
| download | scala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.tar.gz scala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.tar.bz2 scala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.zip | |
Merged revisions 21765-21767,21771 via svnmerge...
Merged revisions 21765-21767,21771 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r21765 | extempore | 2010-04-30 16:41:33 +0200 (Fri, 30 Apr 2010) | 1 line
Kicked partest up to a 6 hour timeout. No review. ........ r21766 |
dubochet | 2010-04-30 19:22:59 +0200 (Fri, 30 Apr 2010) | 1 line
Removed AnnotationInfos.ScalaSigBytes from reflect.generic, as it is
an implementation detail of the compiler and shouldn't be part of a
public API. Review by odersky. ........ r21767 | extempore | 2010-04-30
23:17:56 +0200 (Fri, 30 Apr 2010) | 2 lines
Accumulate missing abstract member errors so they can all be printed
instead of only the first. Closes #2213, no review. ........ r21771 |
extempore | 2010-05-01 19:17:56 +0200 (Sat, 01 May 2010) | 3 lines
Kicked the partest timeouts way up since apparently even 6 hours isn't
enough for windows to complete. Don't know what the deal is there, let's
see if 10 hours is enough. No review. ........
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1502,9 +1502,9 @@ BOOTRAPING TEST AND TEST SUITE <target name="test.suite" depends="pack.done"> <partest classpathref="pack.classpath"> <env key="PATH" path="${build-pack.dir}/bin:${env.PATH}" /> - <sysproperty key="partest.timeout" value="14400" /> - <sysproperty key="partest.test-warning" value="150" /> - <sysproperty key="partest.test-timeout" value="1200" /> + <sysproperty key="partest.timeout" value="36000" /> + <sysproperty key="partest.test-warning" value="300" /> + <sysproperty key="partest.test-timeout" value="1800" /> <sysproperty key="partest.srcdir" value="files" /> <sysproperty key="partest.scalacopts" value="${scalac.args.all}" /> <sysproperty key="partest.javacopts" value="${javac.args}" /> |