Unify layout for C++ interop tests

test/ClangImporter/Inputs/custom-modules/module.map

@@ -2,11 +2,6 @@ module script {
   header "script.h"
 }
 
-module AccessSpecifiers {
-  header "AccessSpecifiers.h"
-  export *
-}
-
 module AvailabilityExtras {
   header "AvailabilityExtras.h"
   export *
@@ -89,11 +84,6 @@ module LinkMusket {
   link framework "Barrel"
 }
 
-module MemoryLayout {
-  header "MemoryLayout.h"
-  export *
-}
-
 module MissingHeader {
   header "this-header-does-not-exist.h"
 }

test/Interop/Cxx/class/Inputs/module.modulemap

@@ -1,3 +1,11 @@
-module CxxMemberVariables {
+module AccessSpecifiers {
+  header "access-specifiers.h"
+}
+
+module MemoryLayout {
+  header "memory-layout.h"
+}
+
+module MemberVariables {
   header "member-variables.h"
 }

test/ClangImporter/access-specifiers-module-interface.swift → test/Interop/Cxx/class/access-specifiers-module-interface.swift

@@ -1,7 +1,7 @@
 // Test module interface produced for C++ access specifiers test.
 // In particular, we don't want any of the private members showing up here.
 
-// RUN: %target-swift-ide-test -print-module -module-to-print=AccessSpecifiers -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=AccessSpecifiers -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK:      struct PublicPrivate {
 // CHECK-NEXT:   typealias PublicTypedef = Int32

test/ClangImporter/access-specifiers.swift → test/Interop/Cxx/class/access-specifiers-typechecker.swift

@@ -1,7 +1,7 @@
 // Test that C++ access specifiers are honored, i.e. private members aren't
 // imported.
 
-// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs/custom-modules/ -enable-cxx-interop
+// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-cxx-interop
 
 import AccessSpecifiers
 

test/Interop/Cxx/class/member-variables-module-interface.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -print-module -module-to-print=CxxMemberVariables -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=MemberVariables -I %S/Inputs -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK:      struct MyClass {
 // CHECK-NEXT:   var const_member: Int32 { get }

test/Interop/Cxx/class/member-variables-typechecker.swift

@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -I %S/Inputs -enable-cxx-interop
 
-import CxxMemberVariables
+import MemberVariables
 
 var s = MyClass()
 s.const_member = 42 // expected-error {{cannot assign to property: 'const_member' setter is inaccessible}}

test/ClangImporter/memory-layout-executable.swift → test/Interop/Cxx/class/memory-layout-execution.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift %s -I %S/Inputs/custom-modules/ -o %t/class_layout -Xfrontend -enable-cxx-interop
+// RUN: %target-build-swift %s -I %S/Inputs -o %t/class_layout -Xfrontend -enable-cxx-interop
 // RUN: %target-codesign %t/class_layout
 // RUN: %target-run %t/class_layout 2&>1
 //

test/ClangImporter/memory-layout-ir.swift → test/Interop/Cxx/class/memory-layout-silgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -I %S/Inputs/custom-modules/ -enable-cxx-interop -emit-ir -o - %s | %FileCheck %s
+// RUN: %target-swift-frontend -I %S/Inputs -enable-cxx-interop -emit-ir -o - %s | %FileCheck %s
 
 import MemoryLayout