Merge commit '644eb7078a' into wip/fresh-merge2

Conflicts:
	build.xml
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala

1 files changed, 26 insertions, 0 deletions

diff --git a/test/files/run/t6669.scala b/test/files/run/t6669.scala
new file mode 100644
index 0000000000..b55718b12b
--- /dev/null
+++ b/test/files/run/t6669.scala
@@ -0,0 +1,26 @@
+import java.io.{ByteArrayOutputStream, PrintStream}
+
+object Test extends App {
+  val baos = new ByteArrayOutputStream()
+  val ps = new PrintStream(baos) 
+
+  // first test with the default classpath
+  (scala.Console withOut ps) {
+    scala.tools.scalap.Main.main(Array("-verbose", "java.lang.Object"))
+  }
+
+  // now make sure we saw the '.' in the classpath
+  val msg1 = baos.toString()
+  assert(msg1 contains "directory classpath: .", s"Did not see '.' in the default class path. Full results were:\n$msg1")
+
+  // then test again with a user specified classpath
+  baos.reset
+
+  (scala.Console withOut ps) {
+    scala.tools.scalap.Main.main(Array("-verbose", "-cp", "whatever", "java.lang.Object"))
+  }
+
+  // now make sure we did not see the '.' in the classpath
+  val msg2 = baos.toString()
+  assert(!(msg2 contains "directory classpath: ."), s"Did saw '.' in the user specified class path. Full results were:\n$msg2")
+}