Skip to content

Commit 33e3217

Browse files
committed
Merge pull request scala#2190 from adriaanm/test-runs-mima-2.10.1
test.done again checks bin compat (using mima 0.1.5)
2 parents 54a9f1b + b775d8f commit 33e3217

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

bincompat-backward.whitelist.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ filter {
154154
{
155155
matchName="scala.reflect.internal.util.Statistics#RelCounter.scala$reflect$internal$util$Statistics$RelCounter$$super$prefix"
156156
problemName=MissingMethodProblem
157+
},
158+
{
159+
matchName="scala.reflect.internal.Names#NameOps.name"
160+
problemName=MissingFieldProblem
157161
}
158162
]
159163
}

build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ END-USER TARGETS
2222
<target name="clean" depends="quick.clean"
2323
description="Removes binaries of compiler and library. Distributions are untouched."/>
2424

25-
<target name="test" depends="test.done, osgi.test, bc.run"
25+
<target name="test" depends="test.done"
2626
description="Runs test suite and bootstrapping test on Scala compiler and library."/>
2727

2828
<target name="test-opt"
@@ -2643,7 +2643,7 @@ BOOTRAPING TEST AND TEST SUITE
26432643
</partest>
26442644
</target>
26452645

2646-
<target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt"/>
2646+
<target name="test.done" depends="test.suite, test.continuations.suite, test.scaladoc, test.stability, test.sbt, osgi.test, bc.run"/>
26472647

26482648

26492649
<!-- ===========================================================================
@@ -2656,7 +2656,7 @@ Binary compatibility testing
26562656
<mkdir dir="${bc-build.dir}"/>
26572657
<!-- Pull down MIMA -->
26582658
<artifact:dependencies pathId="mima.classpath">
2659-
<dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5-SNAPSHOT"/>
2659+
<dependency groupId="com.typesafe" artifactId="mima-reporter_2.9.2" version="0.1.5"/>
26602660
</artifact:dependencies>
26612661
<artifact:dependencies pathId="old.bc.classpath">
26622662
<dependency groupId="org.scala-lang" artifactId="scala-swing" version="2.10.0"/>
@@ -2665,7 +2665,7 @@ Binary compatibility testing
26652665
</artifact:dependencies>
26662666
</target>
26672667

2668-
<target name="bc.run" depends="bc.init, pack.lib">
2668+
<target name="bc.run" depends="bc.init, pack.done">
26692669
<java
26702670
fork="true"
26712671
failonerror="true"

0 commit comments

Comments
 (0)