[interop][SwiftToCxx] cleanup generic struct tests

Author: hyp

test/Interop/SwiftToCxx/generics/generic-struct-execution.cpp

@@ -13,8 +13,6 @@
 #include <cassert>
 #include "generics.h"
 
-extern "C" void puts(const char *);
-
 int main() {
   using namespace Generics;
 

test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift

@@ -7,7 +7,10 @@
 // RUN: echo "constexpr int x = sizeof(Generics::GenericPair<int, int>);" >> %t/generics.h
 // RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
 
-// FIXME: evolution on.
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend %s -enable-library-evolution -typecheck -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
+// RUN: %FileCheck %s < %t/generics.h
+// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
 
 public struct GenericPair<T, T2> {
     let x: T

test/Interop/SwiftToCxx/generics/resilient-generic-struct-execution.cpp

@@ -0,0 +1,13 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend %S/generic-struct-in-cxx.swift -typecheck -enable-library-evolution -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
+
+// RUN: %target-interop-build-clangxx -std=gnu++20 -c %s -I %t -o %t/swift-generics-execution.o
+// RUN: %target-interop-build-swift %S/generic-struct-in-cxx.swift -o %t/swift-generics-execution -Xlinker %t/swift-generics-execution.o -enable-library-evolution -module-name Generics -Xfrontend -entry-point-function-name -Xfrontend swiftMain
+
+// RUN: %target-codesign %t/swift-generics-execution
+// RUN: %target-run %t/swift-generics-execution | %FileCheck %S/generic-struct-execution.cpp
+
+// REQUIRES: executable_test
+
+#include "generic-struct-execution.cpp"