From fd00bc1f01357ecd264b8216373c23014771c124 Mon Sep 17 00:00:00 2001
From: Martin Boehme <mboehme@google.com>
Date: Wed, 13 May 2020 15:06:05 +0200
Subject: [PATCH] Move tests from `CXXInterop` to `Interop/Cxx`.

This is the canonical location that we've agreed on.
---
 test/CXXInterop/Inputs/module.modulemap                       | 3 ---
 .../Cxx/class/Inputs/cxx-constructors.h}                      | 0
 test/Interop/Cxx/class/Inputs/module.modulemap                | 4 ++++
 .../Cxx/class}/cxx-constructors-executable.swift              | 0
 .../Cxx/class}/cxx-constructors-ir.swift                      | 0
 .../Cxx/class}/cxx-constructors-module-interface.swift        | 0
 .../Cxx/class}/cxx-constructors-sil.swift                     | 0
 .../Cxx/class}/cxx-constructors-typecheck.swift               | 0
 8 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 test/CXXInterop/Inputs/module.modulemap
 rename test/{CXXInterop/Inputs/cxx_constructors.h => Interop/Cxx/class/Inputs/cxx-constructors.h} (100%)
 rename test/{CXXInterop => Interop/Cxx/class}/cxx-constructors-executable.swift (100%)
 rename test/{CXXInterop => Interop/Cxx/class}/cxx-constructors-ir.swift (100%)
 rename test/{CXXInterop => Interop/Cxx/class}/cxx-constructors-module-interface.swift (100%)
 rename test/{CXXInterop => Interop/Cxx/class}/cxx-constructors-sil.swift (100%)
 rename test/{CXXInterop => Interop/Cxx/class}/cxx-constructors-typecheck.swift (100%)

diff --git a/test/CXXInterop/Inputs/module.modulemap b/test/CXXInterop/Inputs/module.modulemap
deleted file mode 100644
index 11f93f00a5fc2..0000000000000
--- a/test/CXXInterop/Inputs/module.modulemap
+++ /dev/null
@@ -1,3 +0,0 @@
-module CxxConstructors {
-  header "cxx_constructors.h"
-}
diff --git a/test/CXXInterop/Inputs/cxx_constructors.h b/test/Interop/Cxx/class/Inputs/cxx-constructors.h
similarity index 100%
rename from test/CXXInterop/Inputs/cxx_constructors.h
rename to test/Interop/Cxx/class/Inputs/cxx-constructors.h
diff --git a/test/Interop/Cxx/class/Inputs/module.modulemap b/test/Interop/Cxx/class/Inputs/module.modulemap
index 04c3bdedfda87..475c54c41a7e2 100644
--- a/test/Interop/Cxx/class/Inputs/module.modulemap
+++ b/test/Interop/Cxx/class/Inputs/module.modulemap
@@ -6,6 +6,10 @@ module TypeClassification {
   header "type-classification.h"
 }
 
+module CxxConstructors {
+  header "cxx-constructors.h"
+}
+
 module MemberwiseInitializer {
   header "memberwise-initializer.h"
 }
diff --git a/test/CXXInterop/cxx-constructors-executable.swift b/test/Interop/Cxx/class/cxx-constructors-executable.swift
similarity index 100%
rename from test/CXXInterop/cxx-constructors-executable.swift
rename to test/Interop/Cxx/class/cxx-constructors-executable.swift
diff --git a/test/CXXInterop/cxx-constructors-ir.swift b/test/Interop/Cxx/class/cxx-constructors-ir.swift
similarity index 100%
rename from test/CXXInterop/cxx-constructors-ir.swift
rename to test/Interop/Cxx/class/cxx-constructors-ir.swift
diff --git a/test/CXXInterop/cxx-constructors-module-interface.swift b/test/Interop/Cxx/class/cxx-constructors-module-interface.swift
similarity index 100%
rename from test/CXXInterop/cxx-constructors-module-interface.swift
rename to test/Interop/Cxx/class/cxx-constructors-module-interface.swift
diff --git a/test/CXXInterop/cxx-constructors-sil.swift b/test/Interop/Cxx/class/cxx-constructors-sil.swift
similarity index 100%
rename from test/CXXInterop/cxx-constructors-sil.swift
rename to test/Interop/Cxx/class/cxx-constructors-sil.swift
diff --git a/test/CXXInterop/cxx-constructors-typecheck.swift b/test/Interop/Cxx/class/cxx-constructors-typecheck.swift
similarity index 100%
rename from test/CXXInterop/cxx-constructors-typecheck.swift
rename to test/Interop/Cxx/class/cxx-constructors-typecheck.swift