SI-4602 Make fsc absolutize source file names

The fsc server was using a path supplied by the client to turn things
like class path values into absolute paths. But it wasn't absolutizing
the source file names supplied to the compiler which lead to SI-4602.
This commit adds that absolutizing bit and cleans the logic up a bit
so that the settings object isn't told a path that it already knows.

A test is included that simulates changing directory by forcing two
different -current-dir settings on two different compile sessions on
the same server process.

1 files changed, 57 insertions, 0 deletions

diff --git a/test/files/run/t4602.scala b/test/files/run/t4602.scala
new file mode 100644
index 0000000000..73ba231ccf
--- /dev/null
+++ b/test/files/run/t4602.scala
@@ -0,0 +1,57 @@
+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}")
+  }
+}