File tree 2 files changed +16
-16
lines changed
compiler/test/dotty/tools
2 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ class FromTastyTests extends ParallelTesting {
22
22
def testFilter = Properties .testsFilter
23
23
def updateCheckFiles : Boolean = Properties .testsUpdateCheckfile
24
24
25
- @ Test def posTestFromTasty : Unit = if ( ! scala.util. Properties .isWin) {
25
+ @ Test def posTestFromTasty : Unit = {
26
26
// Can be reproduced with
27
27
// > sbt
28
28
// > dotc -Ythrough-tasty -Ycheck:all <source>
@@ -33,7 +33,7 @@ class FromTastyTests extends ParallelTesting {
33
33
).checkCompile()
34
34
}
35
35
36
- @ Test def runTestFromTasty : Unit = if ( ! scala.util. Properties .isWin) {
36
+ @ Test def runTestFromTasty : Unit = {
37
37
// Can be reproduced with
38
38
// > sbt
39
39
// > dotc -Ythrough-tasty -Ycheck:all <source>
Original file line number Diff line number Diff line change @@ -541,26 +541,26 @@ trait ParallelTesting extends RunnerOrchestration { self =>
541
541
}
542
542
543
543
val eventualResults = filteredSources.map { target =>
544
- pool.submit( encapsulatedCompilation(target) )
544
+ encapsulatedCompilation(target)
545
545
}
546
546
547
- pool.shutdown()
547
+ // pool.shutdown()
548
548
549
- if (! pool.awaitTermination(20 , TimeUnit .MINUTES )) {
550
- val remaining = new ListBuffer [TestSource ]
551
- filteredSources.lazyZip(eventualResults).foreach { (src, res) =>
552
- if (! res.isDone)
553
- remaining += src
554
- }
549
+ // if (!pool.awaitTermination(20, TimeUnit.MINUTES)) {
550
+ // val remaining = new ListBuffer[TestSource]
551
+ // filteredSources.lazyZip(eventualResults).foreach { (src, res) =>
552
+ // if (!res.isDone)
553
+ // remaining += src
554
+ // }
555
555
556
- pool.shutdownNow()
557
- System .setOut(realStdout)
558
- System .setErr(realStderr)
559
- throw new TimeoutException (s " Compiling targets timed out, remaining targets: ${remaining.mkString(" , " )}" )
560
- }
556
+ // pool.shutdownNow()
557
+ // System.setOut(realStdout)
558
+ // System.setErr(realStderr)
559
+ // throw new TimeoutException(s"Compiling targets timed out, remaining targets: ${remaining.mkString(", ")}")
560
+ // }
561
561
562
562
eventualResults.foreach { x =>
563
- try x.get ()
563
+ try x.run ()
564
564
catch {
565
565
case ex : Exception =>
566
566
System .err.println(ex.getMessage)
You can’t perform that action at this time.
0 commit comments