aboutsummaryrefslogtreecommitdiff
path: root/test cases/swift
diff options
context:
space:
mode:
Diffstat (limited to 'test cases/swift')
-rw-r--r--test cases/swift/11 mixed cpp/main.swift (renamed from test cases/swift/10 mixed cpp/main.swift)0
-rw-r--r--test cases/swift/11 mixed cpp/meson.build (renamed from test cases/swift/10 mixed cpp/meson.build)2
-rw-r--r--test cases/swift/11 mixed cpp/mylib.cpp (renamed from test cases/swift/10 mixed cpp/mylib.cpp)0
-rw-r--r--test cases/swift/11 mixed cpp/mylib.h (renamed from test cases/swift/10 mixed cpp/mylib.h)0
-rw-r--r--test cases/swift/12 c std passthrough/header.h (renamed from test cases/swift/11 c std passthrough/header.h)0
-rw-r--r--test cases/swift/12 c std passthrough/main.swift (renamed from test cases/swift/11 c std passthrough/main.swift)0
-rw-r--r--test cases/swift/12 c std passthrough/meson.build (renamed from test cases/swift/11 c std passthrough/meson.build)0
-rw-r--r--test cases/swift/13 mixed objcpp/main.swift (renamed from test cases/swift/11 mixed objcpp/main.swift)0
-rw-r--r--test cases/swift/13 mixed objcpp/meson.build (renamed from test cases/swift/11 mixed objcpp/meson.build)2
-rw-r--r--test cases/swift/13 mixed objcpp/mylib.h (renamed from test cases/swift/11 mixed objcpp/mylib.h)0
-rw-r--r--test cases/swift/13 mixed objcpp/mylib.mm (renamed from test cases/swift/11 mixed objcpp/mylib.mm)0
-rw-r--r--test cases/swift/14 single-file library/main.swift3
-rw-r--r--test cases/swift/14 single-file library/meson.build4
-rw-r--r--test cases/swift/14 single-file library/singlefile.swift1
-rw-r--r--test cases/swift/15 main in single-file library/main.swift3
-rw-r--r--test cases/swift/15 main in single-file library/meson.build4
-rw-r--r--test cases/swift/15 main in single-file library/module.modulemap3
-rw-r--r--test cases/swift/15 main in single-file library/program.c5
-rw-r--r--test cases/swift/15 main in single-file library/program.h1
-rw-r--r--test cases/swift/16 main in multi-file library/main.swift4
-rw-r--r--test cases/swift/16 main in multi-file library/meson.build4
-rw-r--r--test cases/swift/16 main in multi-file library/module.modulemap3
-rw-r--r--test cases/swift/16 main in multi-file library/more.swift3
-rw-r--r--test cases/swift/16 main in multi-file library/program.c5
-rw-r--r--test cases/swift/16 main in multi-file library/program.h1
-rw-r--r--test cases/swift/8 extra args/lib.swift3
-rw-r--r--test cases/swift/8 extra args/main.swift1
-rw-r--r--test cases/swift/8 extra args/meson.build4
28 files changed, 51 insertions, 5 deletions
diff --git a/test cases/swift/10 mixed cpp/main.swift b/test cases/swift/11 mixed cpp/main.swift
index c055dcd..c055dcd 100644
--- a/test cases/swift/10 mixed cpp/main.swift
+++ b/test cases/swift/11 mixed cpp/main.swift
diff --git a/test cases/swift/10 mixed cpp/meson.build b/test cases/swift/11 mixed cpp/meson.build
index 94b70f0..6027341 100644
--- a/test cases/swift/10 mixed cpp/meson.build
+++ b/test cases/swift/11 mixed cpp/meson.build
@@ -8,5 +8,5 @@ if not swiftc.version().version_compare('>= 5.9')
endif
lib = static_library('mylib', 'mylib.cpp')
-exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib)
+exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib, swift_interoperability_mode: 'cpp')
test('cpp interface', exe)
diff --git a/test cases/swift/10 mixed cpp/mylib.cpp b/test cases/swift/11 mixed cpp/mylib.cpp
index 0c61681..0c61681 100644
--- a/test cases/swift/10 mixed cpp/mylib.cpp
+++ b/test cases/swift/11 mixed cpp/mylib.cpp
diff --git a/test cases/swift/10 mixed cpp/mylib.h b/test cases/swift/11 mixed cpp/mylib.h
index c465be4..c465be4 100644
--- a/test cases/swift/10 mixed cpp/mylib.h
+++ b/test cases/swift/11 mixed cpp/mylib.h
diff --git a/test cases/swift/11 c std passthrough/header.h b/test cases/swift/12 c std passthrough/header.h
index 287cdf4..287cdf4 100644
--- a/test cases/swift/11 c std passthrough/header.h
+++ b/test cases/swift/12 c std passthrough/header.h
diff --git a/test cases/swift/11 c std passthrough/main.swift b/test cases/swift/12 c std passthrough/main.swift
index f6358db..f6358db 100644
--- a/test cases/swift/11 c std passthrough/main.swift
+++ b/test cases/swift/12 c std passthrough/main.swift
diff --git a/test cases/swift/11 c std passthrough/meson.build b/test cases/swift/12 c std passthrough/meson.build
index 202768f..202768f 100644
--- a/test cases/swift/11 c std passthrough/meson.build
+++ b/test cases/swift/12 c std passthrough/meson.build
diff --git a/test cases/swift/11 mixed objcpp/main.swift b/test cases/swift/13 mixed objcpp/main.swift
index cd6dd2b..cd6dd2b 100644
--- a/test cases/swift/11 mixed objcpp/main.swift
+++ b/test cases/swift/13 mixed objcpp/main.swift
diff --git a/test cases/swift/11 mixed objcpp/meson.build b/test cases/swift/13 mixed objcpp/meson.build
index 69098e2..a76162a 100644
--- a/test cases/swift/11 mixed objcpp/meson.build
+++ b/test cases/swift/13 mixed objcpp/meson.build
@@ -8,5 +8,5 @@ if not swiftc.version().version_compare('>= 5.9')
endif
lib = static_library('mylib', 'mylib.mm')
-exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib)
+exe = executable('prog', 'main.swift', 'mylib.h', link_with: lib, swift_interoperability_mode: 'cpp')
test('objcpp interface', exe)
diff --git a/test cases/swift/11 mixed objcpp/mylib.h b/test cases/swift/13 mixed objcpp/mylib.h
index 1e7b23d..1e7b23d 100644
--- a/test cases/swift/11 mixed objcpp/mylib.h
+++ b/test cases/swift/13 mixed objcpp/mylib.h
diff --git a/test cases/swift/11 mixed objcpp/mylib.mm b/test cases/swift/13 mixed objcpp/mylib.mm
index f7e9ab3..f7e9ab3 100644
--- a/test cases/swift/11 mixed objcpp/mylib.mm
+++ b/test cases/swift/13 mixed objcpp/mylib.mm
diff --git a/test cases/swift/14 single-file library/main.swift b/test cases/swift/14 single-file library/main.swift
new file mode 100644
index 0000000..ccc8fb9
--- /dev/null
+++ b/test cases/swift/14 single-file library/main.swift
@@ -0,0 +1,3 @@
+import SingleFile
+
+callMe()
diff --git a/test cases/swift/14 single-file library/meson.build b/test cases/swift/14 single-file library/meson.build
new file mode 100644
index 0000000..8eda1d5
--- /dev/null
+++ b/test cases/swift/14 single-file library/meson.build
@@ -0,0 +1,4 @@
+project('single-file library', 'swift')
+
+lib = static_library('SingleFile', 'singlefile.swift')
+executable('program', 'main.swift', link_with: [lib])
diff --git a/test cases/swift/14 single-file library/singlefile.swift b/test cases/swift/14 single-file library/singlefile.swift
new file mode 100644
index 0000000..617952f
--- /dev/null
+++ b/test cases/swift/14 single-file library/singlefile.swift
@@ -0,0 +1 @@
+public func callMe() {}
diff --git a/test cases/swift/15 main in single-file library/main.swift b/test cases/swift/15 main in single-file library/main.swift
new file mode 100644
index 0000000..0d95abb
--- /dev/null
+++ b/test cases/swift/15 main in single-file library/main.swift
@@ -0,0 +1,3 @@
+import CProgram
+
+precondition(callMe() == 4)
diff --git a/test cases/swift/15 main in single-file library/meson.build b/test cases/swift/15 main in single-file library/meson.build
new file mode 100644
index 0000000..2e1202e
--- /dev/null
+++ b/test cases/swift/15 main in single-file library/meson.build
@@ -0,0 +1,4 @@
+project('main in single-file library', 'swift', 'c')
+
+lib = static_library('Library', 'main.swift', include_directories: ['.'])
+executable('program', 'program.c', link_with: [lib])
diff --git a/test cases/swift/15 main in single-file library/module.modulemap b/test cases/swift/15 main in single-file library/module.modulemap
new file mode 100644
index 0000000..3c1817a
--- /dev/null
+++ b/test cases/swift/15 main in single-file library/module.modulemap
@@ -0,0 +1,3 @@
+module CProgram [extern_c] {
+ header "program.h"
+}
diff --git a/test cases/swift/15 main in single-file library/program.c b/test cases/swift/15 main in single-file library/program.c
new file mode 100644
index 0000000..8959dae
--- /dev/null
+++ b/test cases/swift/15 main in single-file library/program.c
@@ -0,0 +1,5 @@
+#include "program.h"
+
+int callMe() {
+ return 4;
+}
diff --git a/test cases/swift/15 main in single-file library/program.h b/test cases/swift/15 main in single-file library/program.h
new file mode 100644
index 0000000..5058be3
--- /dev/null
+++ b/test cases/swift/15 main in single-file library/program.h
@@ -0,0 +1 @@
+int callMe(void);
diff --git a/test cases/swift/16 main in multi-file library/main.swift b/test cases/swift/16 main in multi-file library/main.swift
new file mode 100644
index 0000000..3682e8d
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/main.swift
@@ -0,0 +1,4 @@
+import CProgram
+
+precondition(callMe() == 4)
+precondition(callMe2() == 6)
diff --git a/test cases/swift/16 main in multi-file library/meson.build b/test cases/swift/16 main in multi-file library/meson.build
new file mode 100644
index 0000000..4d287f3
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/meson.build
@@ -0,0 +1,4 @@
+project('main in multi-file library', 'swift', 'c')
+
+lib = static_library('Library', 'main.swift', 'more.swift', include_directories: ['.'])
+executable('program', 'program.c', link_with: [lib])
diff --git a/test cases/swift/16 main in multi-file library/module.modulemap b/test cases/swift/16 main in multi-file library/module.modulemap
new file mode 100644
index 0000000..3c1817a
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/module.modulemap
@@ -0,0 +1,3 @@
+module CProgram [extern_c] {
+ header "program.h"
+}
diff --git a/test cases/swift/16 main in multi-file library/more.swift b/test cases/swift/16 main in multi-file library/more.swift
new file mode 100644
index 0000000..716500f
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/more.swift
@@ -0,0 +1,3 @@
+func callMe2() -> Int {
+ 6
+}
diff --git a/test cases/swift/16 main in multi-file library/program.c b/test cases/swift/16 main in multi-file library/program.c
new file mode 100644
index 0000000..8959dae
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/program.c
@@ -0,0 +1,5 @@
+#include "program.h"
+
+int callMe() {
+ return 4;
+}
diff --git a/test cases/swift/16 main in multi-file library/program.h b/test cases/swift/16 main in multi-file library/program.h
new file mode 100644
index 0000000..5058be3
--- /dev/null
+++ b/test cases/swift/16 main in multi-file library/program.h
@@ -0,0 +1 @@
+int callMe(void);
diff --git a/test cases/swift/8 extra args/lib.swift b/test cases/swift/8 extra args/lib.swift
new file mode 100644
index 0000000..f8167ad
--- /dev/null
+++ b/test cases/swift/8 extra args/lib.swift
@@ -0,0 +1,3 @@
+public func callMe() {
+ print("test")
+}
diff --git a/test cases/swift/8 extra args/main.swift b/test cases/swift/8 extra args/main.swift
deleted file mode 100644
index 1ff8e07..0000000
--- a/test cases/swift/8 extra args/main.swift
+++ /dev/null
@@ -1 +0,0 @@
-print("test")
diff --git a/test cases/swift/8 extra args/meson.build b/test cases/swift/8 extra args/meson.build
index ead2ff5..d243e36 100644
--- a/test cases/swift/8 extra args/meson.build
+++ b/test cases/swift/8 extra args/meson.build
@@ -2,8 +2,8 @@ project('extra args', 'swift')
trace_fname = 'trace.json'
-lib = static_library('main',
- 'main.swift',
+lib = static_library('lib',
+ 'lib.swift',
swift_args: [
'-emit-loaded-module-trace',
'-emit-loaded-module-trace-path', '../' + trace_fname