Update tests

Author: elsh

test/Sema/accessibility_package_import_interface.swift

@@ -10,14 +10,9 @@
 // RUN:   -emit-module-interface-path %t/Dep.swiftinterface \
 // RUN:   -emit-private-module-interface-path %t/Dep.private.swiftinterface
 
-// TEST Dep private interface should contain the package name
-// RUN: %target-swift-typecheck-module-from-interface(%t/Dep.private.swiftinterface) -module-name Dep -I %t
-// RUN: %FileCheck %s --check-prefix=CHECK-DEP-PRIVATE < %t/Dep.private.swiftinterface
-// CHECK-DEP-PRIVATE: -package-name myPkg
-
 // TEST Dep.swiftmodule should contain package name and package symbols
 // RUN: llvm-bcanalyzer --dump %t/Dep.swiftmodule | %FileCheck %s --check-prefix=CHECK-DEP-BC
-// CHECK-DEP-BC: <MODULE_PACKAGE_NAME abbrevid=6/> blob data = 'myPkg'
+// CHECK-DEP-BC: <MODULE_PACKAGE_NAME {{.*}}> blob data = 'myPkg'
 
 // TEST Lib should load Dep.swiftmodule and access package decls if in the same package and error if not
 // RUN: %target-swift-frontend -typecheck %t/Lib.swift -package-name myPkg -I %t
@@ -39,9 +34,9 @@
 // RUN:   -module-name Dep -I %t \
 // RUN:   -o %t/Dep.swiftmodule
 
-// TEST Dep binary built from interface should contain package name but no package symbols
+// TEST Dep binary built from interface should not contain package name or package symbols.
 // RUN: llvm-bcanalyzer --dump %t/Dep.swiftmodule | %FileCheck %s --check-prefix=CHECK-DEP-INTER-BC
-// CHECK-DEP-INTER-BC: <MODULE_PACKAGE_NAME abbrevid=7/> blob data = 'myPkg'
+// CHECK-DEP-INTER-BC-NOT: <MODULE_PACKAGE_NAME {{.*}}> blob data = 'myPkg'
 
 // TEST Lib should error on loading Dep built from interface and accessing package symbols (unless usableFromInline or inlinable)
 // RUN: %target-swift-frontend -typecheck %t/Lib.swift -package-name myPkg -I %t -verify
@@ -109,16 +104,16 @@ public func publicFuncInlinable() {
 }
 
 //--- Lib.swift
-import Dep // expected-error {{module 'Dep' is in package 'myPkg' but was built from a non-package interface; modules of the same package can only be loaded if built from source or package interface}}
+import Dep
 
 public func libFunc() {
   publicFuncInlinable()
   publicFunc()
-  packageFuncInlinable()
+  packageFuncInlinable() // expected-error {{cannot find 'packageFuncInlinable' in scope; did you mean 'publicFuncInlinable'?}}
   packageFunc() // expected-error {{cannot find 'packageFunc' in scope}}
-  let x = PackageKlassUFI()
+  let x = PackageKlassUFI() // expected-error {{cannot find 'PackageKlassUFI' in scope}}
   let y = x.packageVarUFI
-  let z = x.packageVar // expected-error {{value of type 'PackageKlassUFI' has no member 'packageVar'}}
+  let z = x.packageVar
   print(x, y, z)
 }
 

test/Sema/accessibility_package_inline_interface.swift

@@ -10,7 +10,6 @@
 
 // RUN: %FileCheck %s -check-prefix CHECK-UTILS < %t/Utils.swiftinterface
 // CHECK-UTILS: -module-name Utils
-// CHECK-UTILS: -package-name myLib
 // CHECK-UTILS: @usableFromInline
 // CHECK-UTILS: package class PackageKlassProto {
 // CHECK-UTILS:   @usableFromInline

test/Sema/accessibility_package_interface.swift

@@ -18,7 +18,6 @@
 // CHECK-PUBLIC-UTILS-NOT: package class PackageKlass
 // CHECK-PUBLIC-UTILS-NOT: package var pkgVar
 // CHECK-PUBLIC-UTILS: -module-name Utils
-// CHECK-PUBLIC-UTILS: -package-name swift-utils.log
 // CHECK-PUBLIC-UTILS: public func publicFunc()
 // CHECK-PUBLIC-UTILS: @usableFromInline
 // CHECK-PUBLIC-UTILS: package func ufiPackageFunc()
@@ -39,7 +38,6 @@
 // CHECK-PRIVATE-UTILS-NOT: package class PackageKlass
 // CHECK-PRIVATE-UTILS-NOT: package var pkgVar
 // CHECK-PRIVATE-UTILS: -module-name Utils
-// CHECK-PRIVATE-UTILS: -package-name swift-utils.log
 // CHECK-PRIVATE-UTILS: public func publicFunc()
 // CHECK-PRIVATE-UTILS: @usableFromInline
 // CHECK-PRIVATE-UTILS: package func ufiPackageFunc()

test/Serialization/load_package_module.swift

@@ -19,15 +19,10 @@
 // RUN: %target-swift-typecheck-module-from-interface(%t/LibInterface.swiftinterface) -I %t
 // RUN: %FileCheck %s --check-prefix=CHECK-PUBLIC < %t/LibInterface.swiftinterface
 // CHECK-PUBLIC: -module-name LibInterface
-// CHECK-PUBLIC: -package-name
 
-// RUN: %target-swift-typecheck-module-from-interface(%t/LibInterface.private.swiftinterface) -module-name LibInterface -I %t
-// RUN: %FileCheck %s --check-prefix=CHECK-PRIVATE < %t/LibInterface.private.swiftinterface
-// CHECK-PRIVATE: -package-name libPkg
+// RUN: %target-swift-typecheck-module-from-interface(%t/LibInterface.private.swiftinterface) -module-name LibInterface -I %t -verify
 
-// RUN: not %target-swift-frontend -typecheck %t/ClientLoadInterface.swift -package-name otherPkg -I %t 2> %t/resultX.output
-// RUN: %FileCheck %s -check-prefix CHECK-X < %t/resultX.output
-// CHECK-X: error: cannot find 'packageLog' in scope
+// RUN: %target-swift-frontend -typecheck %t/ClientLoadInterface.swift -package-name otherPkg -I %t -verify
 
 // RUN: not %target-swift-frontend -typecheck %t/ClientLoadInterface.swift -package-name libPkg -I %t 2> %t/resultY.output
 // RUN: %FileCheck %s -check-prefix CHECK-Y < %t/resultY.output
@@ -45,7 +40,7 @@ import LibInterface
 
 func someFunc() {
   publicLog(1)
-  packageLog(2)
+  packageLog(2) // expected-error {{cannot find 'packageLog' in scope}}
 }
 
 //--- ClientLoadBinary.swift

test/Serialization/module_package_name.swift

@@ -11,12 +11,10 @@
 // RUN: %target-swift-typecheck-module-from-interface(%t/Logging.swiftinterface) -I %t
 // RUN: %FileCheck %s --check-prefix=CHECK-PUBLIC < %t/Logging.swiftinterface
 // CHECK-PUBLIC: -module-name Logging
-// CHECK-PUBLIC: -package-name
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/Logging.private.swiftinterface) -module-name Logging -I %t
 // RUN: %FileCheck %s --check-prefix=CHECK-PRIVATE < %t/Logging.private.swiftinterface
 // CHECK-PRIVATE: -module-name Logging
-// CHECK-PRIVATE: -package-name MyLoggingPkg
 
 //--- File.swift
 public func log(level: Int) {}