diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 10:03:04 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-01-26 10:03:04 +0000 |
commit | 70cc762d3a29bc91349cd84b3e22bf46d189d817 (patch) | |
tree | e8c54426601087baa824308e4867f7b6f67a6c49 /test/files/buildmanager/t2557 | |
parent | c3d125891f7707cd8b47786bfd063760508b009a (diff) | |
download | scala-70cc762d3a29bc91349cd84b3e22bf46d189d817.tar.gz scala-70cc762d3a29bc91349cd84b3e22bf46d189d817.tar.bz2 scala-70cc762d3a29bc91349cd84b3e22bf46d189d817.zip |
Changed the info statements in refined build ma...
Changed the info statements in refined build manager to print the
information in more consistent way, so that we can test it using
partest. Added more tests for build manager, more to follow... No
review.
Diffstat (limited to 'test/files/buildmanager/t2557')
-rw-r--r-- | test/files/buildmanager/t2557/A.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/B.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/C.scala | 3 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/D.scala | 1 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/E.scala | 1 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/F.scala | 4 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/t2557.changes/D2.scala | 2 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/t2557.check | 10 | ||||
-rw-r--r-- | test/files/buildmanager/t2557/t2557.test | 3 |
9 files changed, 32 insertions, 0 deletions
diff --git a/test/files/buildmanager/t2557/A.scala b/test/files/buildmanager/t2557/A.scala new file mode 100644 index 0000000000..3be55f19a6 --- /dev/null +++ b/test/files/buildmanager/t2557/A.scala @@ -0,0 +1,4 @@ +trait A { + def x = 3 +} + diff --git a/test/files/buildmanager/t2557/B.scala b/test/files/buildmanager/t2557/B.scala new file mode 100644 index 0000000000..ea86a90079 --- /dev/null +++ b/test/files/buildmanager/t2557/B.scala @@ -0,0 +1,4 @@ +trait B extends A { + override def x = super.x * 2 +} + diff --git a/test/files/buildmanager/t2557/C.scala b/test/files/buildmanager/t2557/C.scala new file mode 100644 index 0000000000..dd575ac38d --- /dev/null +++ b/test/files/buildmanager/t2557/C.scala @@ -0,0 +1,3 @@ +trait C extends A { + override def x = super.x + 5 +} diff --git a/test/files/buildmanager/t2557/D.scala b/test/files/buildmanager/t2557/D.scala new file mode 100644 index 0000000000..4e662a80ce --- /dev/null +++ b/test/files/buildmanager/t2557/D.scala @@ -0,0 +1 @@ +trait D extends C with B diff --git a/test/files/buildmanager/t2557/E.scala b/test/files/buildmanager/t2557/E.scala new file mode 100644 index 0000000000..2aee552675 --- /dev/null +++ b/test/files/buildmanager/t2557/E.scala @@ -0,0 +1 @@ +trait E extends D diff --git a/test/files/buildmanager/t2557/F.scala b/test/files/buildmanager/t2557/F.scala new file mode 100644 index 0000000000..e1996704e7 --- /dev/null +++ b/test/files/buildmanager/t2557/F.scala @@ -0,0 +1,4 @@ +object F extends E { + def main(args: Array[String]) = + println(x) +} diff --git a/test/files/buildmanager/t2557/t2557.changes/D2.scala b/test/files/buildmanager/t2557/t2557.changes/D2.scala new file mode 100644 index 0000000000..67295f8e6d --- /dev/null +++ b/test/files/buildmanager/t2557/t2557.changes/D2.scala @@ -0,0 +1,2 @@ +trait D extends B with C + diff --git a/test/files/buildmanager/t2557/t2557.check b/test/files/buildmanager/t2557/t2557.check new file mode 100644 index 0000000000..ae373c15dd --- /dev/null +++ b/test/files/buildmanager/t2557/t2557.check @@ -0,0 +1,10 @@ +builder > A.scala B.scala C.scala D.scala E.scala F.scala +compiling Set(A.scala, B.scala, C.scala, D.scala, E.scala, F.scala) +Changes: Map() +builder > D.scala +compiling Set(D.scala) +Changes: Map(trait D -> List(Changed(Class(D))[List((java.lang.Object,java.lang.Object), (C,B), (B,C))])) +invalidate E.scala because parents have changed [Changed(Class(D))[List((java.lang.Object,java.lang.Object), (C,B), (B,C))]] +invalidate F.scala because parents have changed [Changed(Class(D))[List((java.lang.Object,java.lang.Object), (C,B), (B,C))]] +compiling Set(E.scala, F.scala) +Changes: Map(trait E -> List(), object F -> List()) diff --git a/test/files/buildmanager/t2557/t2557.test b/test/files/buildmanager/t2557/t2557.test new file mode 100644 index 0000000000..6b0103092f --- /dev/null +++ b/test/files/buildmanager/t2557/t2557.test @@ -0,0 +1,3 @@ +>>compile A.scala B.scala C.scala D.scala E.scala F.scala +>>update D.scala=>D2.scala +>>compile D.scala |