Split out the part of the test that's failing on Windows

Author: DougGregor

test/Interop/C/struct/noncopyable_structs.swift

@@ -1,4 +1,3 @@
-
 // Check that we get the expected errors for incorrect uses of noncopyable
 // imported types with both C and C++ interoperability.
 
@@ -56,13 +55,6 @@ func bad1(_: borrowing BadDestroyNonCopyableType) { }
 // expected-warning@+1{{'BadDestroyNonCopyableType2' is deprecated: destroy function 'badDestroy2' must have a single parameter with type 'BadDestroyNonCopyableType2'}}
 func bad2(_: borrowing BadDestroyNonCopyableType2) { }
 
-#if !os(Windows)
-#if CPLUSPLUS
-// expected-cplusplus-warning@+1{{'ExtraDestroy' is deprecated: destroy operation 'extraDestroy' is not allowed on types with a non-trivial destructor}}
-func extra(_: borrowing ExtraDestroy) { }
-#endif
-#endif
-
 #endif
 
 // CHECK-SIL: sil shared @$sSo21NonCopyableWithDeinitVfD : $@convention(method) (@owned NonCopyableWithDeinit) -> () {

test/Interop/C/struct/noncopyable_structs_nontrivial.swift

@@ -0,0 +1,12 @@
+// Split out from noncopyable_structs.swift due to an issue with Windows.
+
+// RUN: %target-swift-frontend -emit-sil -I %S/Inputs/ -I %swift_src_root/lib/ClangImporter/SwiftBridging %s -verify -DERRORS -verify-additional-prefix conly-
+// RUN: %target-swift-frontend -emit-sil -I %S/Inputs/ -I %swift_src_root/lib/ClangImporter/SwiftBridging %s -verify -DERRORS -DCPLUSPLUS -verify-additional-prefix cplusplus- -cxx-interoperability-mode=default
+
+// XFAIL: OS=windows-msvc
+import NoncopyableStructs
+
+#if CPLUSPLUS
+// expected-cplusplus-warning@+1{{'ExtraDestroy' is deprecated: destroy operation 'extraDestroy' is not allowed on types with a non-trivial destructor}}
+func extra(_: borrowing ExtraDestroy) { }
+#endif