From a79ee73df180206eb9d17b643a92dee4e7ce5beb Mon Sep 17 00:00:00 2001 From: nielsen Date: Mon, 11 May 2009 10:25:16 +0000 Subject: Rebuild all plugin tests and moved them back to... Rebuild all plugin tests and moved them back to the working test cases --- test/disabled/neg/plugin-after-terminal.check | 2 -- test/disabled/neg/plugin-after-terminal.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-after-terminal/misc/build.sh | 14 -------- .../plugin-after-terminal/misc/scalac-plugin.xml | 6 ---- .../neg/plugin-after-terminal/src/ThePlugin.scala | 31 ---------------- .../neg/plugin-after-terminal/testsource.scala | 4 --- test/disabled/neg/plugin-before-parser.check | 2 -- test/disabled/neg/plugin-before-parser.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-before-parser/misc/build.sh | 14 -------- .../plugin-before-parser/misc/scalac-plugin.xml | 6 ---- .../neg/plugin-before-parser/src/ThePlugin.scala | 32 ----------------- .../neg/plugin-before-parser/testsource.scala | 4 --- test/disabled/neg/plugin-cyclic-dependency.check | 2 -- test/disabled/neg/plugin-cyclic-dependency.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-cyclic-dependency/misc/build.sh | 14 -------- .../misc/scalac-plugin.xml | 6 ---- .../plugin-cyclic-dependency/src/ThePlugin.scala | 41 ---------------------- .../neg/plugin-cyclic-dependency/testsource.scala | 4 --- test/disabled/neg/plugin-multiple-rafter.check | 4 --- test/disabled/neg/plugin-multiple-rafter.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-multiple-rafter/misc/build.sh | 14 -------- .../plugin-multiple-rafter/misc/scalac-plugin.xml | 6 ---- .../neg/plugin-multiple-rafter/src/ThePlugin.scala | 31 ---------------- .../neg/plugin-multiple-rafter/testsource.scala | 4 --- test/disabled/neg/plugin-rafter-before-1.check | 2 -- test/disabled/neg/plugin-rafter-before-1.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-rafter-before-1/misc/build.sh | 14 -------- .../plugin-rafter-before-1/misc/scalac-plugin.xml | 6 ---- .../neg/plugin-rafter-before-1/src/ThePlugin.scala | 31 ---------------- .../neg/plugin-rafter-before-1/testsource.scala | 4 --- test/disabled/neg/plugin-rightafter-terminal.check | 2 -- test/disabled/neg/plugin-rightafter-terminal.flags | 2 -- .../lib/plugins.jar.desired.sha1 | 1 - .../neg/plugin-rightafter-terminal/misc/build.sh | 14 -------- .../misc/scalac-plugin.xml | 6 ---- .../plugin-rightafter-terminal/src/ThePlugin.scala | 32 ----------------- .../plugin-rightafter-terminal/testsource.scala | 4 --- 42 files changed, 374 deletions(-) delete mode 100644 test/disabled/neg/plugin-after-terminal.check delete mode 100644 test/disabled/neg/plugin-after-terminal.flags delete mode 100644 test/disabled/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-after-terminal/misc/build.sh delete mode 100644 test/disabled/neg/plugin-after-terminal/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-after-terminal/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-after-terminal/testsource.scala delete mode 100644 test/disabled/neg/plugin-before-parser.check delete mode 100644 test/disabled/neg/plugin-before-parser.flags delete mode 100644 test/disabled/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-before-parser/misc/build.sh delete mode 100644 test/disabled/neg/plugin-before-parser/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-before-parser/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-before-parser/testsource.scala delete mode 100644 test/disabled/neg/plugin-cyclic-dependency.check delete mode 100644 test/disabled/neg/plugin-cyclic-dependency.flags delete mode 100644 test/disabled/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-cyclic-dependency/misc/build.sh delete mode 100644 test/disabled/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-cyclic-dependency/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-cyclic-dependency/testsource.scala delete mode 100644 test/disabled/neg/plugin-multiple-rafter.check delete mode 100644 test/disabled/neg/plugin-multiple-rafter.flags delete mode 100644 test/disabled/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-multiple-rafter/misc/build.sh delete mode 100644 test/disabled/neg/plugin-multiple-rafter/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-multiple-rafter/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-multiple-rafter/testsource.scala delete mode 100644 test/disabled/neg/plugin-rafter-before-1.check delete mode 100644 test/disabled/neg/plugin-rafter-before-1.flags delete mode 100644 test/disabled/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-rafter-before-1/misc/build.sh delete mode 100644 test/disabled/neg/plugin-rafter-before-1/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-rafter-before-1/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-rafter-before-1/testsource.scala delete mode 100644 test/disabled/neg/plugin-rightafter-terminal.check delete mode 100644 test/disabled/neg/plugin-rightafter-terminal.flags delete mode 100644 test/disabled/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 delete mode 100755 test/disabled/neg/plugin-rightafter-terminal/misc/build.sh delete mode 100644 test/disabled/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml delete mode 100644 test/disabled/neg/plugin-rightafter-terminal/src/ThePlugin.scala delete mode 100644 test/disabled/neg/plugin-rightafter-terminal/testsource.scala (limited to 'test/disabled') diff --git a/test/disabled/neg/plugin-after-terminal.check b/test/disabled/neg/plugin-after-terminal.check deleted file mode 100644 index b846dc0ab5..0000000000 --- a/test/disabled/neg/plugin-after-terminal.check +++ /dev/null @@ -1,2 +0,0 @@ -error: [phase assembly, after dependency on terminal phase not allowed: afterterminal => terminal] -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-after-terminal.flags b/test/disabled/neg/plugin-after-terminal.flags deleted file mode 100644 index 6a44376213..0000000000 --- a/test/disabled/neg/plugin-after-terminal.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-after-terminal/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 deleted file mode 100644 index b2c43b9c63..0000000000 --- a/test/disabled/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d555230c8bbe55d958de8dc78a07553fa473903 ?plugins.jar diff --git a/test/disabled/neg/plugin-after-terminal/misc/build.sh b/test/disabled/neg/plugin-after-terminal/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-after-terminal/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-after-terminal/misc/scalac-plugin.xml b/test/disabled/neg/plugin-after-terminal/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-after-terminal/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-after-terminal/src/ThePlugin.scala b/test/disabled/neg/plugin-after-terminal/src/ThePlugin.scala deleted file mode 100644 index f3c913086e..0000000000 --- a/test/disabled/neg/plugin-after-terminal/src/ThePlugin.scala +++ /dev/null @@ -1,31 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "afterterminal" - val description = "Declares one plugin that wants to be after the terminal phase" - val components = List[PluginComponent](thePhase) - - private object thePhase extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]("terminal") - - val phaseName = ThePlugin.this.name - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-after-terminal/testsource.scala b/test/disabled/neg/plugin-after-terminal/testsource.scala deleted file mode 100644 index 519d162fdf..0000000000 --- a/test/disabled/neg/plugin-after-terminal/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("afterterminal") -} - diff --git a/test/disabled/neg/plugin-before-parser.check b/test/disabled/neg/plugin-before-parser.check deleted file mode 100644 index 253659eedb..0000000000 --- a/test/disabled/neg/plugin-before-parser.check +++ /dev/null @@ -1,2 +0,0 @@ -error: [phase assembly, before dependency on parser phase not allowed: parser => beforeparser] -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-before-parser.flags b/test/disabled/neg/plugin-before-parser.flags deleted file mode 100644 index 632530922c..0000000000 --- a/test/disabled/neg/plugin-before-parser.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-before-parser/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 deleted file mode 100644 index b9320adb9c..0000000000 --- a/test/disabled/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -9cca2242701f71f4369067e0fed8c7da2fd72f62 ?plugins.jar diff --git a/test/disabled/neg/plugin-before-parser/misc/build.sh b/test/disabled/neg/plugin-before-parser/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-before-parser/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-before-parser/misc/scalac-plugin.xml b/test/disabled/neg/plugin-before-parser/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-before-parser/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-before-parser/src/ThePlugin.scala b/test/disabled/neg/plugin-before-parser/src/ThePlugin.scala deleted file mode 100644 index 8714a55dc4..0000000000 --- a/test/disabled/neg/plugin-before-parser/src/ThePlugin.scala +++ /dev/null @@ -1,32 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "beforeparser" - val description = "Declares one plugin that wants to be before the parser phase" - val components = List[PluginComponent](thePhase) - - private object thePhase extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]() - override val runsBefore = List[String]("parser") - - val phaseName = ThePlugin.this.name - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-before-parser/testsource.scala b/test/disabled/neg/plugin-before-parser/testsource.scala deleted file mode 100644 index 9928aaa83c..0000000000 --- a/test/disabled/neg/plugin-before-parser/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("beforeparser") -} - diff --git a/test/disabled/neg/plugin-cyclic-dependency.check b/test/disabled/neg/plugin-cyclic-dependency.check deleted file mode 100644 index 7c1aeebfa0..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency.check +++ /dev/null @@ -1,2 +0,0 @@ -error: fatal error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice! -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-cyclic-dependency.flags b/test/disabled/neg/plugin-cyclic-dependency.flags deleted file mode 100644 index 8716aaa65f..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-cyclic-dependency/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 deleted file mode 100644 index 7d62792253..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -adfc1223549e592354b56821ee9ed808d391a859 ?plugins.jar diff --git a/test/disabled/neg/plugin-cyclic-dependency/misc/build.sh b/test/disabled/neg/plugin-cyclic-dependency/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml b/test/disabled/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-cyclic-dependency/src/ThePlugin.scala b/test/disabled/neg/plugin-cyclic-dependency/src/ThePlugin.scala deleted file mode 100644 index 1dfc15cb28..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency/src/ThePlugin.scala +++ /dev/null @@ -1,41 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "cyclicdependency" - val description = "Declares two phases that have a cyclic dependency" - val components = List[PluginComponent](thePhase1,thePhase2) - - private object thePhase1 extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]("tailcalls","cyclicdependency2") - - val phaseName = ThePlugin.this.name + "1" - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private object thePhase2 extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]("dce","cyclicdependency1") - - val phaseName = ThePlugin.this.name + "2" - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-cyclic-dependency/testsource.scala b/test/disabled/neg/plugin-cyclic-dependency/testsource.scala deleted file mode 100644 index f1513ec9a0..0000000000 --- a/test/disabled/neg/plugin-cyclic-dependency/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("cyclicdependency") -} - diff --git a/test/disabled/neg/plugin-multiple-rafter.check b/test/disabled/neg/plugin-multiple-rafter.check deleted file mode 100644 index 5ba932413f..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter.check +++ /dev/null @@ -1,4 +0,0 @@ -error: fatal error: Multiple phases want to run right after the phase explicitouter -Phases: erasure, multi-rafter, -Re-run with -Xgenerate-phase-graph to better see the problem. -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-multiple-rafter.flags b/test/disabled/neg/plugin-multiple-rafter.flags deleted file mode 100644 index dcae7f2f96..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-multiple-rafter/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 deleted file mode 100644 index 243acf76d7..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f1b1571728dc322666ad8a78cdbb943eee0c013 ?plugins.jar diff --git a/test/disabled/neg/plugin-multiple-rafter/misc/build.sh b/test/disabled/neg/plugin-multiple-rafter/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-multiple-rafter/misc/scalac-plugin.xml b/test/disabled/neg/plugin-multiple-rafter/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-multiple-rafter/src/ThePlugin.scala b/test/disabled/neg/plugin-multiple-rafter/src/ThePlugin.scala deleted file mode 100644 index 4c761517c1..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter/src/ThePlugin.scala +++ /dev/null @@ -1,31 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "multi-rafter" - val description = "" - val components = List[PluginComponent](thePhase) - - private object thePhase extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]() - override val runsRightAfter = Some("explicitouter") - val phaseName = ThePlugin.this.name - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-multiple-rafter/testsource.scala b/test/disabled/neg/plugin-multiple-rafter/testsource.scala deleted file mode 100644 index f73db1eb60..0000000000 --- a/test/disabled/neg/plugin-multiple-rafter/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("multi-rafter") -} - diff --git a/test/disabled/neg/plugin-rafter-before-1.check b/test/disabled/neg/plugin-rafter-before-1.check deleted file mode 100644 index 7afe3be031..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1.check +++ /dev/null @@ -1,2 +0,0 @@ -error: fatal error: phase erasure want to run right after explicitouter, but some phase has declared to run before erasure. Re-run with -Xgenerate-phase-graph to better see the problem. -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-rafter-before-1.flags b/test/disabled/neg/plugin-rafter-before-1.flags deleted file mode 100644 index 8bf03145b9..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-rafter-before-1/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 deleted file mode 100644 index 1aa5a0aaf1..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -4583290684b78581ce2e6affaa37b38d06e8dc45 ?plugins.jar diff --git a/test/disabled/neg/plugin-rafter-before-1/misc/build.sh b/test/disabled/neg/plugin-rafter-before-1/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-rafter-before-1/misc/scalac-plugin.xml b/test/disabled/neg/plugin-rafter-before-1/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-rafter-before-1/src/ThePlugin.scala b/test/disabled/neg/plugin-rafter-before-1/src/ThePlugin.scala deleted file mode 100644 index c42a914066..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1/src/ThePlugin.scala +++ /dev/null @@ -1,31 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "rafter-before-1" - val description = "" - val components = List[PluginComponent](thePhase1) - - private object thePhase1 extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]("refchecks") - override val runsBefore = List[String]("erasure") - val phaseName = ThePlugin.this.name - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-rafter-before-1/testsource.scala b/test/disabled/neg/plugin-rafter-before-1/testsource.scala deleted file mode 100644 index 836459db22..0000000000 --- a/test/disabled/neg/plugin-rafter-before-1/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("rafter-before-1") -} - diff --git a/test/disabled/neg/plugin-rightafter-terminal.check b/test/disabled/neg/plugin-rightafter-terminal.check deleted file mode 100644 index 8107c373e0..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal.check +++ /dev/null @@ -1,2 +0,0 @@ -error: [phase assembly, right after dependency on terminal phase not allowed: rightafterterminal => terminal] -one error found \ No newline at end of file diff --git a/test/disabled/neg/plugin-rightafter-terminal.flags b/test/disabled/neg/plugin-rightafter-terminal.flags deleted file mode 100644 index 948a318668..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal.flags +++ /dev/null @@ -1,2 +0,0 @@ --Xplugin:files/neg/plugin-rightafter-terminal/lib/plugins.jar - diff --git a/test/disabled/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 b/test/disabled/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 deleted file mode 100644 index be3c84d6dd..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -2220a89d53daa59e0daedbfd432bb5e8810e20d3 ?plugins.jar diff --git a/test/disabled/neg/plugin-rightafter-terminal/misc/build.sh b/test/disabled/neg/plugin-rightafter-terminal/misc/build.sh deleted file mode 100755 index 8899009d7f..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal/misc/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/" - -BASE=`pwd` - -if [[ -d "${BASE}/src" ]] ; then - - mkdir -p build - ${SCALAC} -d build src/*.scala - jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build . - rm -rf build -fi - diff --git a/test/disabled/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml b/test/disabled/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml deleted file mode 100644 index 58fff40950..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - beforeparser - scala.test.plugins.ThePlugin - - diff --git a/test/disabled/neg/plugin-rightafter-terminal/src/ThePlugin.scala b/test/disabled/neg/plugin-rightafter-terminal/src/ThePlugin.scala deleted file mode 100644 index 47dd06ec8a..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal/src/ThePlugin.scala +++ /dev/null @@ -1,32 +0,0 @@ -package scala.test.plugins - -import scala.tools.nsc -import nsc.Global -import nsc.Phase -import nsc.plugins.Plugin -import nsc.plugins.PluginComponent - -class ThePlugin(val global: Global) extends Plugin { - import global._ - - val name = "rightafterterminal" - val description = "Declares one plugin that wants to be right after the terminal phase" - val components = List[PluginComponent](thePhase) - - private object thePhase extends PluginComponent { - val global = ThePlugin.this.global - - val runsAfter = List[String]() - override val runsRightAfter = Some("terminal") - - val phaseName = ThePlugin.this.name - - def newPhase(prev: Phase) = new ThePhase(prev) - } - - private class ThePhase(prev: Phase) extends Phase(prev) { - def name = ThePlugin.this.name - def run {} - } -} - diff --git a/test/disabled/neg/plugin-rightafter-terminal/testsource.scala b/test/disabled/neg/plugin-rightafter-terminal/testsource.scala deleted file mode 100644 index 7af767b638..0000000000 --- a/test/disabled/neg/plugin-rightafter-terminal/testsource.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends Application { - println("rightafterterminal") -} - -- cgit v1.2.3