Move -sourcepath tests

Move -sourcepath tests so that the directory passed to -sourcepath does not contain any unrelated files.

Author: smarter

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -131,7 +131,7 @@ object SymbolLoaders {
  ctx.warning(i"""$what ${tree.name} is in the wrong directory.
  |It was declared to be in package ${path.reverse.mkString(".")}
  |But it is found in directory ${filePath.reverse.mkString(File.separator)}""",
- tree.sourcePos)
+ tree.sourcePos.focus)
  ok
  }
 

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -39,10 +39,10 @@ class CompilationTests extends ParallelTesting {
  compileFile("tests/pos-scala2/rewrites.scala", scala2CompatMode.and("-rewrite")).copyToTarget(),
  compileFile("tests/pos-special/utf8encoded.scala", explicitUTF8),
  compileFile("tests/pos-special/utf16encoded.scala", explicitUTF16),
- compileFile("tests/pos-special/completeFromSource/Test.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
- compileFile("tests/pos-special/completeFromSource/Test2.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
- compileFile("tests/pos-special/completeFromSource/Test3.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
- compileFile("tests/pos-special/completeFromSource/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special")),
+ compileFile("tests/pos-special/sourcepath/outer/Test.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+ compileFile("tests/pos-special/sourcepath/outer/Test2.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+ compileFile("tests/pos-special/sourcepath/outer/Test3.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
+ compileFile("tests/pos-special/sourcepath/outer/nested/Test4.scala", defaultOptions.and("-sourcepath", "tests/pos-special/sourcepath")),
  compileFilesInDir("tests/pos-special/fatal-warnings", defaultOptions.and("-Xfatal-warnings", "-feature")),
  compileFilesInDir("tests/pos-special/spec-t5545", defaultOptions),
  compileFilesInDir("tests/pos-special/strawman-collections", defaultOptions),
@@ -135,7 +135,8 @@ class CompilationTests extends ParallelTesting {
  compileFilesInDir("tests/neg-custom-args/isInstanceOf", allowDeepSubtypes and "-Xfatal-warnings"),
  compileFile("tests/neg-custom-args/i3627.scala", allowDeepSubtypes),
  compileFile("tests/neg-custom-args/matchtype-loop.scala", allowDeepSubtypes),
- compileFile("tests/neg-custom-args/completeFromSource/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args")),
+ compileFile("tests/neg-custom-args/sourcepath/outer/nested/Test1.scala", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath")),
+ compileDir("tests/neg-custom-args/sourcepath2/hi", defaultOptions.and("-sourcepath", "tests/neg-custom-args/sourcepath2", "-Xfatal-warnings")),
  compileList("duplicate source", List(
  "tests/neg-custom-args/toplevel-samesource/S.scala",
  "tests/neg-custom-args/toplevel-samesource/nested/S.scala"),

tests/neg-custom-args/completeFromSource/nested/D.java renamed to tests/neg-custom-args/sourcepath/outer/nested/D.java

@@ -1,4 +1,4 @@
-package completeFromSource.nested;
+package outer.nested;
 
 public class D {
  public D(int i) {

tests/neg-custom-args/completeFromSource/nested/Test1.scala renamed to tests/neg-custom-args/sourcepath/outer/nested/Test1.scala

@@ -1,4 +1,4 @@
-package completeFromSource.nested
+package outer.nested
 
 class Test4 {
 

tests/neg-custom-args/sourcepath2/hi/A.check

@@ -0,0 +1,6 @@
+-- Error: tests/neg-custom-args/sourcepath2/hi/A.scala:3:6 -------------------------------------------------------------
+3 |class Hello { // error
+ | ^
+ | class Hello is in the wrong directory.
+ | It was declared to be in package <empty>
+ | But it is found in directory hi

tests/neg-custom-args/sourcepath2/hi/A.scala

@@ -0,0 +1,5 @@
+// Missing `package hi`
+
+class Hello { // error
+ val x: Int = 1
+}

tests/neg-custom-args/sourcepath2/hi/B.scala

@@ -0,0 +1,2 @@
+package hi
+class B

tests/pos-special/completeFromSource/Test.scala renamed to tests/pos-special/sourcepath/outer/Test.scala

@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 
 class Test extends nested.A(22) {
 

tests/pos-special/completeFromSource/Test2.scala renamed to tests/pos-special/sourcepath/outer/Test2.scala

@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 import nested._
 
 class Test2 extends A(22) {

tests/pos-special/completeFromSource/Test3.scala renamed to tests/pos-special/sourcepath/outer/Test3.scala

@@ -1,4 +1,4 @@
-package completeFromSource
+package outer
 import nested._
 
 class Test3 {