Permalink
Browse files

Passes reasonable subsets of binary-compatibility and osgi tests

  • Loading branch information...
willb committed Sep 11, 2013
1 parent 2bf13b6 commit 8eb795ae1a83e83dc242252ea8da36968cbc60b3
Showing with 36 additions and 0 deletions.
  1. +28 −0 scala-2.10.1-bc.patch
  2. +8 −0 scala.spec
View
@@ -0,0 +1,28 @@
diff -u orig/bincompat-backward.whitelist.conf new/bincompat-backward.whitelist.conf
--- orig/bincompat-backward.whitelist.conf 2013-09-11 12:59:13.684010082 -0500
+++ new/bincompat-backward.whitelist.conf 2013-09-11 12:59:08.751002599 -0500
@@ -1,6 +1,10 @@
filter {
problems=[
# Scala library
+ {
+ matchName="scala.xml.dtd.ElementValidator.scala$xml$dtd$ElementValidator$$find$2"
+ problemName=IncompatibleMethTypeProblem
+ },
{
# can only be called from Stream::distinct, which cannot itself be inlined, so distinct is the only feasible call-site
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$4"
diff -u orig/bincompat-forward.whitelist.conf new/bincompat-forward.whitelist.conf
--- orig/bincompat-forward.whitelist.conf 2013-09-11 12:59:13.684010082 -0500
+++ new/bincompat-forward.whitelist.conf 2013-09-11 12:59:08.751002599 -0500
@@ -5,6 +5,10 @@
# matchName="scala.collection.mutable.MutableList.tailImpl"
# problemName=MissingMethodProblem
# },
+ {
+ matchName="scala.xml.dtd.ElementValidator.scala$xml$dtd$ElementValidator$$find$2"
+ problemName=IncompatibleMethTypeProblem
+ },
{
# can only be called from Stream::distinct, which cannot itself be inlined, so distinct is the only feasible call-site
matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$6"
View
@@ -31,7 +31,12 @@ Patch4: scala-2.10.0-java7.patch
Patch5: scala-2.10.0-bnd.patch
# fix incompatibilities with JLine 2.7
Patch6: scala-2.10-jline.patch
# work around a known bug when running binary-compatibility tests against
# non-optimized builds (we can't do optimized builds due to another bug):
# http://grokbase.com/t/gg/scala-internals/1347g1jahq/2-10-x-bc-test-fails
Patch7: scala-2.10.1-bc.patch
Source21: scala.keys
Source22: scala.mime
Source23: scala-mime-info.xml
@@ -104,6 +109,7 @@ the Scala programming language
%patch4 -p1 -b .jdk7
%patch5 -p1 -b .bndx
%patch6 -p1 -b .rvk
%patch7 -p1 -b .bc
pushd src
rm -rf jline
@@ -163,6 +169,8 @@ rm -rf test/files/presentation/ide-bug-1000531
rm -rf test/files/presentation/visibility
rm -rf test/files/presentation/ping-pong
rm -f test/osgi/src/ReflectionToolboxTest.scala
ant test
%install

0 comments on commit 8eb795a

Please sign in to comment.