diff options
| author | James Iry <jamesiry@gmail.com> | 2013-03-02 09:20:18 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-03-02 09:20:18 -0800 |
| commit | 33e32179fd6dcf06554b817f54b97ac5a6e052ab (patch) | |
| tree | be1ce78a55b8e377a34b920e7c20300728b567b4 | |
| parent | 54a9f1bb765d3c3a5a350a5a9c20e886dd8dd4d0 (diff) | |
| parent | b775d8f16d988a4fc7992f0cea1459b8a317f995 (diff) | |
| download | scala-2.10.1.tar.gz scala-2.10.1.tar.bz2 scala-2.10.1.zip | |
Merge pull request #2190 from adriaanm/test-runs-mima-2.10.1v2.10.1-RC3v2.10.1
test.done again checks bin compat (using mima 0.1.5)
| -rw-r--r-- | bincompat-backward.whitelist.conf | 4 | ||||
| -rw-r--r-- | build.xml | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf index f559d673f0..4794666721 100644 --- a/bincompat-backward.whitelist.conf +++ b/bincompat-backward.whitelist.conf @@ -154,6 +154,10 @@ filter { { matchName="scala.reflect.internal.util.Statistics#RelCounter.scala$reflect$internal$util$Statistics$RelCounter$$super$prefix" problemName=MissingMethodProblem + }, + { + matchName="scala.reflect.internal.Names#NameOps.name" + problemName=MissingFieldProblem } ] } @@ -22,7 +22,7 @@ END-USER TARGETS <target name="clean" depends="quick.clean" description="Removes binaries of compiler and library. Distributions are untouched."/> - <target name="test" depends="test.done, osgi.test, bc.run" + <target name="test" depends="test.done" description="Runs test suite and bootstrapping test on Scala compiler and library."/> <target name="test-opt" @@ -2643,7 +2643,7 @@ BOOTRAPING TEST AND TEST SUITE </partest> </target> - <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt"/> + <target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt, osgi.test, bc.run"/> <!-- =========================================================================== @@ -2656,7 +2656,7 @@ Binary compatibility testing <mkdir dir="${bc-build.dir}"/> <!-- Pull down MIMA --> <artifact:dependencies pathId="mima.classpath"> - <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5-SNAPSHOT"/> + <dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5"/> </artifact:dependencies> <artifact:dependencies pathId="old.bc.classpath"> <dependency groupId="org.scala-lang" artifactId="scala-swing" version="2.10.0"/> @@ -2665,7 +2665,7 @@ Binary compatibility testing </artifact:dependencies> </target> - <target name="bc.run" depends="bc.init, pack.lib"> + <target name="bc.run" depends="bc.init, pack.done"> <java fork="true" failonerror="true" |