From bf9ff6e5eee7a5b7bfb2b50b0dc5bf948e87eaae Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 1 Aug 2025 15:33:41 +0300 Subject: Condense test directory names for 1.9. --- test cases/swift/10 mixed cpp/main.swift | 6 ----- test cases/swift/10 mixed cpp/meson.build | 12 ---------- test cases/swift/10 mixed cpp/mylib.cpp | 22 ----------------- test cases/swift/10 mixed cpp/mylib.h | 13 ---------- test cases/swift/11 c std passthrough/header.h | 10 -------- test cases/swift/11 c std passthrough/main.swift | 3 --- test cases/swift/11 c std passthrough/meson.build | 3 --- test cases/swift/11 mixed cpp/main.swift | 6 +++++ test cases/swift/11 mixed cpp/meson.build | 12 ++++++++++ test cases/swift/11 mixed cpp/mylib.cpp | 22 +++++++++++++++++ test cases/swift/11 mixed cpp/mylib.h | 13 ++++++++++ test cases/swift/11 mixed objcpp/main.swift | 2 -- test cases/swift/11 mixed objcpp/meson.build | 12 ---------- test cases/swift/11 mixed objcpp/mylib.h | 17 ------------- test cases/swift/11 mixed objcpp/mylib.mm | 29 ----------------------- test cases/swift/12 c std passthrough/header.h | 10 ++++++++ test cases/swift/12 c std passthrough/main.swift | 3 +++ test cases/swift/12 c std passthrough/meson.build | 3 +++ test cases/swift/13 mixed objcpp/main.swift | 2 ++ test cases/swift/13 mixed objcpp/meson.build | 12 ++++++++++ test cases/swift/13 mixed objcpp/mylib.h | 17 +++++++++++++ test cases/swift/13 mixed objcpp/mylib.mm | 29 +++++++++++++++++++++++ 22 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 test cases/swift/10 mixed cpp/main.swift delete mode 100644 test cases/swift/10 mixed cpp/meson.build delete mode 100644 test cases/swift/10 mixed cpp/mylib.cpp delete mode 100644 test cases/swift/10 mixed cpp/mylib.h delete mode 100644 test cases/swift/11 c std passthrough/header.h delete mode 100644 test cases/swift/11 c std passthrough/main.swift delete mode 100644 test cases/swift/11 c std passthrough/meson.build create mode 100644 test cases/swift/11 mixed cpp/main.swift create mode 100644 test cases/swift/11 mixed cpp/meson.build create mode 100644 test cases/swift/11 mixed cpp/mylib.cpp create mode 100644 test cases/swift/11 mixed cpp/mylib.h delete mode 100644 test cases/swift/11 mixed objcpp/main.swift delete mode 100644 test cases/swift/11 mixed objcpp/meson.build delete mode 100644 test cases/swift/11 mixed objcpp/mylib.h delete mode 100644 test cases/swift/11 mixed objcpp/mylib.mm create mode 100644 test cases/swift/12 c std passthrough/header.h create mode 100644 test cases/swift/12 c std passthrough/main.swift create mode 100644 test cases/swift/12 c std passthrough/meson.build create mode 100644 test cases/swift/13 mixed objcpp/main.swift create mode 100644 test cases/swift/13 mixed objcpp/meson.build create mode 100644 test cases/swift/13 mixed objcpp/mylib.h create mode 100644 test cases/swift/13 mixed objcpp/mylib.mm (limited to 'test cases/swift') diff --git a/test cases/swift/10 mixed cpp/main.swift b/test cases/swift/10 mixed cpp/main.swift deleted file mode 100644 index c055dcdb7..000000000 --- a/test cases/swift/10 mixed cpp/main.swift +++ /dev/null @@ -1,6 +0,0 @@ -testCallFromSwift() -testCallWithParam("Calling C++ function from Swift with param is working") - -var test = Test() -var testtwo = Test(1) -test.testCallFromClass() diff --git a/test cases/swift/10 mixed cpp/meson.build b/test cases/swift/10 mixed cpp/meson.build deleted file mode 100644 index 94b70f07b..000000000 --- a/test cases/swift/10 mixed cpp/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -project('mixed cpp', 'cpp', 'swift') - -swiftc = meson.get_compiler('swift') - -# Testing C++ and Swift interoperability requires Swift 5.9 -if not swiftc.version().version_compare('>= 5.9') - error('MESON_SKIP_TEST Test requires Swift 5.9') -endif - -lib = static_library('mylib', 'mylib.cpp') -exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib) -test('cpp interface', exe) diff --git a/test cases/swift/10 mixed cpp/mylib.cpp b/test cases/swift/10 mixed cpp/mylib.cpp deleted file mode 100644 index 0c616814e..000000000 --- a/test cases/swift/10 mixed cpp/mylib.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "mylib.h" -#include - -Test::Test() { - std::cout << "Test initialized" << std::endl; -} - -Test::Test(int param) { - std::cout << "Test initialized with param " << param << std::endl; -} - -void Test::testCallFromClass() { - std::cout << "Calling C++ class function from Swift is working" << std::endl; -} - -void testCallFromSwift() { - std::cout << "Calling this C++ function from Swift is working" << std::endl; -} - -void testCallWithParam(const std::string ¶m) { - std::cout << param << std::endl; -} diff --git a/test cases/swift/10 mixed cpp/mylib.h b/test cases/swift/10 mixed cpp/mylib.h deleted file mode 100644 index c465be44e..000000000 --- a/test cases/swift/10 mixed cpp/mylib.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include - -class Test { -public: - Test(); - Test(int param); - - void testCallFromClass(); -}; - -void testCallFromSwift(); -void testCallWithParam(const std::string ¶m); diff --git a/test cases/swift/11 c std passthrough/header.h b/test cases/swift/11 c std passthrough/header.h deleted file mode 100644 index 287cdf4d7..000000000 --- a/test cases/swift/11 c std passthrough/header.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -// let's just assume the default isn't c18. -#if __STDC_VERSION__ == 201710L -typedef struct Datatype { - int x; -} Datatype; -#else -#error C standard version not set! -#endif diff --git a/test cases/swift/11 c std passthrough/main.swift b/test cases/swift/11 c std passthrough/main.swift deleted file mode 100644 index f6358dba1..000000000 --- a/test cases/swift/11 c std passthrough/main.swift +++ /dev/null @@ -1,3 +0,0 @@ -let d = Datatype(x: 1) - -precondition(d.x == 1) diff --git a/test cases/swift/11 c std passthrough/meson.build b/test cases/swift/11 c std passthrough/meson.build deleted file mode 100644 index 202768fcf..000000000 --- a/test cases/swift/11 c std passthrough/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('c std passthrough', 'swift', 'c', default_options: {'c_std': 'c18'}) - -executable('program', 'main.swift', 'header.h') diff --git a/test cases/swift/11 mixed cpp/main.swift b/test cases/swift/11 mixed cpp/main.swift new file mode 100644 index 000000000..c055dcdb7 --- /dev/null +++ b/test cases/swift/11 mixed cpp/main.swift @@ -0,0 +1,6 @@ +testCallFromSwift() +testCallWithParam("Calling C++ function from Swift with param is working") + +var test = Test() +var testtwo = Test(1) +test.testCallFromClass() diff --git a/test cases/swift/11 mixed cpp/meson.build b/test cases/swift/11 mixed cpp/meson.build new file mode 100644 index 000000000..94b70f07b --- /dev/null +++ b/test cases/swift/11 mixed cpp/meson.build @@ -0,0 +1,12 @@ +project('mixed cpp', 'cpp', 'swift') + +swiftc = meson.get_compiler('swift') + +# Testing C++ and Swift interoperability requires Swift 5.9 +if not swiftc.version().version_compare('>= 5.9') + error('MESON_SKIP_TEST Test requires Swift 5.9') +endif + +lib = static_library('mylib', 'mylib.cpp') +exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib) +test('cpp interface', exe) diff --git a/test cases/swift/11 mixed cpp/mylib.cpp b/test cases/swift/11 mixed cpp/mylib.cpp new file mode 100644 index 000000000..0c616814e --- /dev/null +++ b/test cases/swift/11 mixed cpp/mylib.cpp @@ -0,0 +1,22 @@ +#include "mylib.h" +#include + +Test::Test() { + std::cout << "Test initialized" << std::endl; +} + +Test::Test(int param) { + std::cout << "Test initialized with param " << param << std::endl; +} + +void Test::testCallFromClass() { + std::cout << "Calling C++ class function from Swift is working" << std::endl; +} + +void testCallFromSwift() { + std::cout << "Calling this C++ function from Swift is working" << std::endl; +} + +void testCallWithParam(const std::string ¶m) { + std::cout << param << std::endl; +} diff --git a/test cases/swift/11 mixed cpp/mylib.h b/test cases/swift/11 mixed cpp/mylib.h new file mode 100644 index 000000000..c465be44e --- /dev/null +++ b/test cases/swift/11 mixed cpp/mylib.h @@ -0,0 +1,13 @@ +#pragma once +#include + +class Test { +public: + Test(); + Test(int param); + + void testCallFromClass(); +}; + +void testCallFromSwift(); +void testCallWithParam(const std::string ¶m); diff --git a/test cases/swift/11 mixed objcpp/main.swift b/test cases/swift/11 mixed objcpp/main.swift deleted file mode 100644 index cd6dd2b3e..000000000 --- a/test cases/swift/11 mixed objcpp/main.swift +++ /dev/null @@ -1,2 +0,0 @@ -var test: ObjCPPTest = ObjCPPTest() -test.testCallToObjCPP() diff --git a/test cases/swift/11 mixed objcpp/meson.build b/test cases/swift/11 mixed objcpp/meson.build deleted file mode 100644 index 69098e246..000000000 --- a/test cases/swift/11 mixed objcpp/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -project('mixed objcpp', 'objcpp', 'swift') - -swiftc = meson.get_compiler('swift') - -# Testing Objective-C++ and Swift interoperability requires Swift 5.9 -if not swiftc.version().version_compare('>= 5.9') - error('MESON_SKIP_TEST Test requires Swift 5.9') -endif - -lib = static_library('mylib', 'mylib.mm') -exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib) -test('objcpp interface', exe) diff --git a/test cases/swift/11 mixed objcpp/mylib.h b/test cases/swift/11 mixed objcpp/mylib.h deleted file mode 100644 index 1e7b23d70..000000000 --- a/test cases/swift/11 mixed objcpp/mylib.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once -#import - -class Test { -public: - Test(); - - void testCallFromClass(); -}; - -@interface ObjCPPTest: NSObject { - @private Test *test; -} -- (id)init; -- (void)dealloc; -- (void)testCallToObjCPP; -@end diff --git a/test cases/swift/11 mixed objcpp/mylib.mm b/test cases/swift/11 mixed objcpp/mylib.mm deleted file mode 100644 index f7e9ab3f1..000000000 --- a/test cases/swift/11 mixed objcpp/mylib.mm +++ /dev/null @@ -1,29 +0,0 @@ -#include "mylib.h" -#include - -Test::Test() { - std::cout << "Test initialized" << std::endl; -} - -void Test::testCallFromClass() { - std::cout << "Calling Objective-C++ class function from Swift is working" << std::endl; -} - -@implementation ObjCPPTest -- (id)init { - self = [super init]; - if (self) { - test = new Test(); - } - return self; -} - -- (void)dealloc { - delete test; - [super dealloc]; -} - -- (void)testCallToObjCPP { - test->testCallFromClass(); -} -@end diff --git a/test cases/swift/12 c std passthrough/header.h b/test cases/swift/12 c std passthrough/header.h new file mode 100644 index 000000000..287cdf4d7 --- /dev/null +++ b/test cases/swift/12 c std passthrough/header.h @@ -0,0 +1,10 @@ +#pragma once + +// let's just assume the default isn't c18. +#if __STDC_VERSION__ == 201710L +typedef struct Datatype { + int x; +} Datatype; +#else +#error C standard version not set! +#endif diff --git a/test cases/swift/12 c std passthrough/main.swift b/test cases/swift/12 c std passthrough/main.swift new file mode 100644 index 000000000..f6358dba1 --- /dev/null +++ b/test cases/swift/12 c std passthrough/main.swift @@ -0,0 +1,3 @@ +let d = Datatype(x: 1) + +precondition(d.x == 1) diff --git a/test cases/swift/12 c std passthrough/meson.build b/test cases/swift/12 c std passthrough/meson.build new file mode 100644 index 000000000..202768fcf --- /dev/null +++ b/test cases/swift/12 c std passthrough/meson.build @@ -0,0 +1,3 @@ +project('c std passthrough', 'swift', 'c', default_options: {'c_std': 'c18'}) + +executable('program', 'main.swift', 'header.h') diff --git a/test cases/swift/13 mixed objcpp/main.swift b/test cases/swift/13 mixed objcpp/main.swift new file mode 100644 index 000000000..cd6dd2b3e --- /dev/null +++ b/test cases/swift/13 mixed objcpp/main.swift @@ -0,0 +1,2 @@ +var test: ObjCPPTest = ObjCPPTest() +test.testCallToObjCPP() diff --git a/test cases/swift/13 mixed objcpp/meson.build b/test cases/swift/13 mixed objcpp/meson.build new file mode 100644 index 000000000..69098e246 --- /dev/null +++ b/test cases/swift/13 mixed objcpp/meson.build @@ -0,0 +1,12 @@ +project('mixed objcpp', 'objcpp', 'swift') + +swiftc = meson.get_compiler('swift') + +# Testing Objective-C++ and Swift interoperability requires Swift 5.9 +if not swiftc.version().version_compare('>= 5.9') + error('MESON_SKIP_TEST Test requires Swift 5.9') +endif + +lib = static_library('mylib', 'mylib.mm') +exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib) +test('objcpp interface', exe) diff --git a/test cases/swift/13 mixed objcpp/mylib.h b/test cases/swift/13 mixed objcpp/mylib.h new file mode 100644 index 000000000..1e7b23d70 --- /dev/null +++ b/test cases/swift/13 mixed objcpp/mylib.h @@ -0,0 +1,17 @@ +#pragma once +#import + +class Test { +public: + Test(); + + void testCallFromClass(); +}; + +@interface ObjCPPTest: NSObject { + @private Test *test; +} +- (id)init; +- (void)dealloc; +- (void)testCallToObjCPP; +@end diff --git a/test cases/swift/13 mixed objcpp/mylib.mm b/test cases/swift/13 mixed objcpp/mylib.mm new file mode 100644 index 000000000..f7e9ab3f1 --- /dev/null +++ b/test cases/swift/13 mixed objcpp/mylib.mm @@ -0,0 +1,29 @@ +#include "mylib.h" +#include + +Test::Test() { + std::cout << "Test initialized" << std::endl; +} + +void Test::testCallFromClass() { + std::cout << "Calling Objective-C++ class function from Swift is working" << std::endl; +} + +@implementation ObjCPPTest +- (id)init { + self = [super init]; + if (self) { + test = new Test(); + } + return self; +} + +- (void)dealloc { + delete test; + [super dealloc]; +} + +- (void)testCallToObjCPP { + test->testCallFromClass(); +} +@end -- cgit v1.2.3