diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-07-18 14:36:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 14:36:50 -0700 |
| commit | ca57d028cebb8314aab63e3877751460231948f2 (patch) | |
| tree | 18bbfa00e49641afaabbc93a734625710cf8860f /src | |
| parent | 52fb8e88aa4ac5f1c165065e08c6bbe4d49eb4a9 (diff) | |
| parent | 36e2ae2fbd3d3637f2be6453e67778b706e1baa9 (diff) | |
| download | scala-ca57d028cebb8314aab63e3877751460231948f2.tar.gz scala-ca57d028cebb8314aab63e3877751460231948f2.tar.bz2 scala-ca57d028cebb8314aab63e3877751460231948f2.zip | |
Merge pull request #5285 from szeiger/wip/sbt-bootstrap
Switch the bootstrap build over to sbt
Diffstat (limited to 'src')
| -rw-r--r-- | src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala b/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala index 2cb4f5fd4a..00096dd359 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/InteractiveTest.scala @@ -78,10 +78,16 @@ abstract class InteractiveTest } protected def execute(): Unit = { - loadSources() - runDefaultTests() + util.stringFromStream { ostream => + Console.withOut(ostream) { + loadSources() + runDefaultTests() + } + }.lines.map(normalize).foreach(println) } + protected def normalize(s: String) = s + /** Load all sources before executing the test. */ protected def loadSources() { // ask the presentation compiler to track all sources. We do |