summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-26 13:31:45 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-01-29 21:39:10 +0100
commitbffe776b2ad04d4ebadd2517345ffa0bc4d0723f (patch)
tree3dc5189c50167a515cf9f5392ffc3bcbcc0c295f /test/files
parenteff78b852e8b866badf9b9738f896c2a31c05474 (diff)
downloadscala-bffe776b2ad04d4ebadd2517345ffa0bc4d0723f.tar.gz
scala-bffe776b2ad04d4ebadd2517345ffa0bc4d0723f.tar.bz2
scala-bffe776b2ad04d4ebadd2517345ffa0bc4d0723f.zip
[backport] Disabled SI-6987.
It causes spurious failures - a typical example: [partest] testing: [...]/files/run/t6987.scala [FAILED] [partest] did not get the string expected, full results were: [partest] Fast Scala compiler version 2.11.0-20130126-111937-f01e001c77 -- Copyright 2002-2013, LAMP/EPFL [partest] [Given arguments: -shutdown -verbose] [partest] [Transformed arguments: -shutdown -verbose -current-dir /localhome/jenkins/b/workspace/scala-checkin-manual] [partest] [VM arguments: ] [partest] java.net.ConnectException: Connection refused [partest] [Connecting to compilation daemon at port 32808 failed; re-trying...] [partest] [No compilation server running.] [partest] (cherry picked from commit 53d5df5c1d52b941732c243159de4f44456f03b4)
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/t6987.check1
-rw-r--r--test/files/run/t6987.scala43
2 files changed, 0 insertions, 44 deletions
diff --git a/test/files/run/t6987.check b/test/files/run/t6987.check
deleted file mode 100644
index 86fc96c679..0000000000
--- a/test/files/run/t6987.check
+++ /dev/null
@@ -1 +0,0 @@
-got successful verbose results!
diff --git a/test/files/run/t6987.scala b/test/files/run/t6987.scala
deleted file mode 100644
index 37e91d61ae..0000000000
--- a/test/files/run/t6987.scala
+++ /dev/null
@@ -1,43 +0,0 @@
-import java.io._
-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 success = (scala.Console withOut ps) {
- // shut down the server via the client using the verbose flag
- CompileClient.process(Array("-shutdown", "-verbose"))
- }
-
- // now make sure we got success and a verbose result
- val msg = baos.toString()
-
- if (success) {
- if (msg contains "Settings after normalizing paths") {
- println("got successful verbose results!")
- } else {
- println("did not get the string expected, full results were:")
- println(msg)
- }
- } else {
- println("got a failure. Full results were:")
- println(msg)
- }
- scala.Console.flush
-}