summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-10-21 14:03:11 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-10-21 14:03:11 -0700
commit90d6605d88ee01cb7e1e8761cc82ba28c8575d27 (patch)
treec11f1890edcdef4f49fcfada14ae01c7beb3ddf2 /test/files
parent98cee68a7026a3ca819cfecacc0c59c943000943 (diff)
parent88be7ea7efe65c4856a7f3d884db31269890f260 (diff)
downloadscala-90d6605d88ee01cb7e1e8761cc82ba28c8575d27.tar.gz
scala-90d6605d88ee01cb7e1e8761cc82ba28c8575d27.tar.bz2
scala-90d6605d88ee01cb7e1e8761cc82ba28c8575d27.zip
Merge pull request #3067 from retronym/ticket/7020-2
Moving disabled tests to their rightful home.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/disabled/run/t4602.scala57
-rw-r--r--test/files/disabled/t7020.check19
-rw-r--r--test/files/disabled/t7020.flags1
-rw-r--r--test/files/disabled/t7020.scala30
4 files changed, 0 insertions, 107 deletions
diff --git a/test/files/disabled/run/t4602.scala b/test/files/disabled/run/t4602.scala
deleted file mode 100644
index 655c350497..0000000000
--- a/test/files/disabled/run/t4602.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-import java.io.{File, FileOutputStream, BufferedOutputStream, FileWriter, ByteArrayOutputStream, PrintStream}
-import tools.nsc.{CompileClient, CompileServer}
-import java.util.concurrent.{CountDownLatch, TimeUnit}
-
-object Test extends App {
- val startupLatch = new CountDownLatch(1)
- // we have to explicitly launch our server because when the client launches a server it uses
- // the "scala" shell command meaning whatever version of scala (and whatever version of libraries)
- // happens to be in the path gets used
- val t = new Thread(new Runnable {
- def run() = {
- CompileServer.execute(() => startupLatch.countDown(), Array[String]())
- }
- })
- t setDaemon true
- t.start()
- if (!startupLatch.await(2, TimeUnit.MINUTES))
- sys error "Timeout waiting for server to start"
-
- val baos = new ByteArrayOutputStream()
- val ps = new PrintStream(baos)
-
- val outdir = scala.reflect.io.Directory(sys.props("partest.output"))
-
- val dirNameAndPath = (1 to 2).toList map {number =>
- val name = s"Hello${number}"
- val dir = outdir / number.toString
- (dir, name, dir / s"${name}.scala")
- }
-
- dirNameAndPath foreach {case (dir, name, path) =>
- dir.createDirectory()
- val file = path.jfile
- val out = new FileWriter(file)
- try
- out.write(s"object ${name}\n")
- finally
- out.close
- }
-
- val success = (scala.Console withOut ps) {
- dirNameAndPath foreach {case (path, name, _) =>
- CompileClient.process(Array("-verbose", "-current-dir", path.toString, s"${name}.scala"))
- }
-
- CompileClient.process(Array("-shutdown"))
- }
-
- // now make sure we got success and the correct normalized paths
- val msg = baos.toString()
-
- assert(success, s"got a failure. Full results were: \n${msg}")
- dirNameAndPath foreach {case (_, _, path) =>
- val expected = s"Input files after normalizing paths: ${path}"
- assert(msg contains expected, s"could not find '${expected}' in output. Full results were: \n${msg}")
- }
-}
diff --git a/test/files/disabled/t7020.check b/test/files/disabled/t7020.check
deleted file mode 100644
index f9600ca7fc..0000000000
--- a/test/files/disabled/t7020.check
+++ /dev/null
@@ -1,19 +0,0 @@
-t7020.scala:3: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
- List(5) match {
- ^
-t7020.scala:10: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
- List(5) match {
- ^
-t7020.scala:17: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
- List(5) match {
- ^
-t7020.scala:24: warning: match may not be exhaustive.
-It would fail on the following inputs: List((x: Int forSome x not in (1, 2, 4, 5, 6, 7))), List((x: Int forSome x not in (1, 2, 4, 5, 6, 7)), _), List(1, _), List(2, _), List(4, _), List(5, _), List(6, _), List(7, _), List(??, _), List(_, _)
- List(5) match {
- ^
-error: No warnings can be incurred under -Xfatal-warnings.
-four warnings found
-one error found
diff --git a/test/files/disabled/t7020.flags b/test/files/disabled/t7020.flags
deleted file mode 100644
index e8fb65d50c..0000000000
--- a/test/files/disabled/t7020.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfatal-warnings \ No newline at end of file
diff --git a/test/files/disabled/t7020.scala b/test/files/disabled/t7020.scala
deleted file mode 100644
index cc5421bab1..0000000000
--- a/test/files/disabled/t7020.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-object Test {
- // warning was non-deterministic
- List(5) match {
- case 1 :: Nil | 2 :: Nil =>
- case (x@(4 | 5 | 6)) :: Nil =>
- case 7 :: Nil =>
- case Nil =>
- }
-
- List(5) match {
- case 1 :: Nil | 2 :: Nil =>
- case (x@(4 | 5 | 6)) :: Nil =>
- case 7 :: Nil =>
- case Nil =>
- }
-
- List(5) match {
- case 1 :: Nil | 2 :: Nil =>
- case (x@(4 | 5 | 6)) :: Nil =>
- case 7 :: Nil =>
- case Nil =>
- }
-
- List(5) match {
- case 1 :: Nil | 2 :: Nil =>
- case (x@(4 | 5 | 6)) :: Nil =>
- case 7 :: Nil =>
- case Nil =>
- }
-}