Skip to content

Commit fdb57db

Browse files
committed
Temporarily disable ContextEscapeDetection
It does not compile with dotty because of scala#1894 and lampepfl/scala#4
1 parent 4148093 commit fdb57db

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

compiler/test/dotty/tools/ContextEscapeDetection.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.LinkedList;
88
import java.util.List;
99

10-
public abstract class ContextEscapeDetection {
10+
/*public abstract class ContextEscapeDetection {
1111
public static class TestContext{
1212
public TestContext(WeakReference<Contexts.Context> context, String testName) {
1313
this.context = context;
@@ -34,3 +34,4 @@ public synchronized void clearContext() {
3434
this.clearCtx();
3535
}
3636
}
37+
*/

compiler/test/dotty/tools/ContextEscapeDetector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Assert;
66
import java.lang.ref.WeakReference;
77

8-
public class ContextEscapeDetector extends RunListener {
8+
/*public class ContextEscapeDetector extends RunListener {
99
1010
//context can be captured by objects, eg NoDenotation
1111
public static final int CONTEXTS_ALLOWED = 1;
@@ -106,3 +106,4 @@ private static synchronized void forceGCHeuristic2() {
106106
}
107107
}
108108
}
109+
*/

compiler/test/dotty/tools/DottyTest.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import dotc.Compiler
1414

1515
import dotc.core.Phases.Phase
1616

17-
class DottyTest extends ContextEscapeDetection{
17+
class DottyTest /*extends ContextEscapeDetection*/{
1818

1919
dotc.parsing.Scanners // initialize keywords
2020

@@ -30,10 +30,12 @@ class DottyTest extends ContextEscapeDetection{
3030
ctx
3131
}
3232

33+
/*
3334
override def getCtx: Context = ctx
3435
override def clearCtx() = {
3536
ctx = null
3637
}
38+
*/
3739

3840
private def compilerWithChecker(phase: String)(assertion:(tpd.Tree, Context) => Unit) = new Compiler {
3941
override def phases = {

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ object DottyBuild extends Build {
246246

247247
// enable verbose exception messages for JUnit
248248
testOptions in Test += Tests.Argument(
249-
TestFrameworks.JUnit, "-a", "-v",
250-
"--run-listener=dotty.tools.ContextEscapeDetector"
249+
TestFrameworks.JUnit, "-a", "-v"/*,
250+
"--run-listener=dotty.tools.ContextEscapeDetector"*/
251251
),
252252
testOptions in Test += Tests.Cleanup({ () => partestLockFile.delete }),
253253

0 commit comments

Comments
 (0)