Homogenize package ids and literals

The unpickled term in a package id is different from the original but the
type is the same.

In a literal prefer constants in the types over thsoe in the terms.

With this change, we get identical typed tree output also for core/pickled.

1 files changed, 8 insertions, 3 deletions

diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 39dd16dc9..303bf46cd 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -19,6 +19,11 @@ class tests extends CompilerTest {
       "-d", "./out/"
   )
 
+  val doEmitBytecode = List("-Ystop-before:terminal")
+  val failedbyName = List("-Ystop-before:collectEntryPoints") // #288
+  val failedUnderscore = List("-Ystop-before:collectEntryPoints") // #289
+  val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler")
+
   val failedOther = List("-Ystop-before:collectEntryPoints") // some non-obvious reason. need to look deeper
   val twice = List("#runs", "2", "-YnoDoubleBindings")
   val staleSymbolError: List[String] = List()
@@ -32,8 +37,8 @@ class tests extends CompilerTest {
   val newDir = "./tests/new/"
   val dotcDir = "./src/dotty/"
 
-  @Test def pickle_pickleOK = compileDir(posDir + "pickleOK/", "-Xprint-types" :: testPickling)
-  @Test def pickle_pickling = compileDir(dotcDir + "tools/dotc/core/pickling", testPickling)
+  @Test def pickle_pickleOK = compileDir(posDir + "pickleOK/", testPickling)
+  @Test def pickle_pickling = compileDir(dotcDir + "tools/dotc/core/pickling/", testPickling)
 
   @Test def pos_t2168_pat = compileFile(posDir, "t2168")
   @Test def pos_erasure = compileFile(posDir, "erasure")
@@ -175,6 +180,6 @@ class tests extends CompilerTest {
 
   val javaDir = "./tests/pos/java-interop/"
   @Test def java_all = compileFiles(javaDir)
-
+  
   //@Test def dotc_compilercommand = compileFile(dotcDir + "tools/dotc/config/", "CompilerCommand")
 }