Remove redundant "cxx" from test names.

meg-gupta · Oct 9, 2020 · 3066e16 · 3066e16
1 parent b2c5a3e
commit 3066e16
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...terop/Cxx/class/Inputs/cxx-constructors.h → test/Interop/Cxx/class/Inputs/constructors.h b/...terop/Cxx/class/Inputs/cxx-constructors.h → test/Interop/Cxx/class/Inputs/constructors.h
diff --git a/test/Interop/Cxx/class/Inputs/module.modulemap b/test/Interop/Cxx/class/Inputs/module.modulemap
@@ -6,8 +6,8 @@ module TypeClassification {
   header "type-classification.h"
 }
 
-module CxxConstructors {
-  header "cxx-constructors.h"
+module Constructors {
+  header "constructors.h"
 }
 
 module MemberwiseInitializer {

diff --git a/...x/class/cxx-constructors-executable.swift → ...p/Cxx/class/constructors-executable.swift b/...x/class/cxx-constructors-executable.swift → ...p/Cxx/class/constructors-executable.swift
@@ -3,7 +3,7 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
-import CxxConstructors
+import Constructors
 
 var CxxConstructorTestSuite = TestSuite("CxxConstructors")
 

diff --git a/...terop/Cxx/class/cxx-constructors-ir.swift → test/Interop/Cxx/class/constructors-ir.swift b/...terop/Cxx/class/cxx-constructors-ir.swift → test/Interop/Cxx/class/constructors-ir.swift
@@ -4,7 +4,7 @@
 // RUN: %swift -module-name Swift -target armv7-none-linux-androideabi -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=ITANIUM_ARM
 // RUN: %swift -module-name Swift -target x86_64-unknown-windows-msvc -dump-clang-diagnostics -I %S/Inputs -enable-cxx-interop -emit-ir %s -parse-stdlib -parse-as-library -disable-legacy-type-info | %FileCheck %s -check-prefix=MICROSOFT_X64
 
-import CxxConstructors
+import Constructors
 
 typealias Void = ()
 

diff --git a/...s/cxx-constructors-module-interface.swift → ...class/constructors-module-interface.swift b/...s/cxx-constructors-module-interface.swift → ...class/constructors-module-interface.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -print-module -module-to-print=CxxConstructors -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-cxx-interop | %FileCheck %s
 
 // CHECK:      struct ExplicitDefaultConstructor {
 // CHECK-NEXT:   var x: Int32

diff --git a/...erop/Cxx/class/cxx-constructors-sil.swift → .../Interop/Cxx/class/constructors-sil.swift b/...erop/Cxx/class/cxx-constructors-sil.swift → .../Interop/Cxx/class/constructors-sil.swift
@@ -1,6 +1,6 @@
 // RUN: %target-swift-frontend -I %S/Inputs -enable-cxx-interop -emit-sil %s | %FileCheck %s
 
-import CxxConstructors
+import Constructors
 
 // The most important thing to test here is that the constructor result is returned
 // with an @out attribute.

diff --git a/...xx/class/cxx-constructors-typecheck.swift → .../Cxx/class/constructors-typechecker.swift b/...xx/class/cxx-constructors-typecheck.swift → .../Cxx/class/constructors-typechecker.swift
@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-cxx-interop
 
-import CxxConstructors
+import Constructors
 
 let explicit = ExplicitDefaultConstructor()