210 files changed, 314 insertions, 20 deletions

diff --git a/test cases/common/104 has arg/meson.build b/test cases/common/104 has arg/meson.build
index 466bed9..500b8a9 100644
--- a/test cases/common/104 has arg/meson.build
+++ b/test cases/common/104 has arg/meson.build
@@ -56,9 +56,22 @@ if cpp.get_id() == 'gcc' and cpp.version().version_compare('>=12.1.0')
   # Handle special -Wno-attributes=foo where -Wattributes=foo is invalid
   # i.e. our usual -Wno-foo -Wfoo hack doesn't work for -Wattributes=foo.
   assert(cpp.has_argument('-Wno-attributes=meson::i_do_not_exist'))
-  # Likewise, the positive counterpart to -Wno-vla-larger-than is
-  # -Wvla-larger-than=N
-  assert(cpp.has_argument('-Wno-vla-larger-than'))
+endif
+
+if cpp.get_id() == 'gcc'
+  # Handle negative flags whose positive counterparts require a value to be
+  # specified.
+  if cpp.version().version_compare('>=4.4.0')
+    assert(cpp.has_argument('-Wno-frame-larger-than'))
+  endif
+  if cpp.version().version_compare('>=4.7.0')
+    assert(cpp.has_argument('-Wno-stack-usage'))
+  endif
+  if cpp.version().version_compare('>=7.1.0')
+    assert(cpp.has_argument('-Wno-alloc-size-larger-than'))
+    assert(cpp.has_argument('-Wno-alloca-larger-than'))
+    assert(cpp.has_argument('-Wno-vla-larger-than'))
+  endif
 endif
 
 if cc.get_id() == 'clang' and cc.version().version_compare('<=4.0.0')
diff --git a/test cases/common/220 fs module/meson.build b/test cases/common/220 fs module/meson.build
index e5397ee..383b263 100644
--- a/test cases/common/220 fs module/meson.build
+++ b/test cases/common/220 fs module/meson.build
@@ -52,6 +52,7 @@ unixabs = '/foo'
 if is_windows
   assert(fs.is_absolute(winabs), 'is_absolute windows not detected')
   assert(not fs.is_absolute(unixabs), 'is_absolute unix false positive')
+  assert(fs.is_absolute('//foo'), 'is_absolute failed on incomplete UNC path')
 else
   assert(fs.is_absolute(unixabs), 'is_absolute unix not detected')
   assert(not fs.is_absolute(winabs), 'is_absolute windows false positive')
@@ -84,7 +85,7 @@ assert(new == 'foo',  'replace_suffix did not only delete last suffix')
 
 # `/` on windows is interpreted like `.drive` which in general may not be `c:/`
 # the files need not exist for fs.replace_suffix()
-original = is_windows ? 'j:/foo/bar.txt' : '/foo/bar.txt'
+original = is_windows ? 'j:\\foo\\bar.txt' : '/foo/bar.txt'
 new_check = is_windows ? 'j:\\foo\\bar.ini' : '/foo/bar.ini'
 
 new = fs.replace_suffix(original, '.ini')
@@ -139,11 +140,7 @@ endif
 
 # parts of path
 assert(fs.parent('foo/bar') == 'foo', 'failed to get dirname')
-if not is_windows
-assert(fs.parent(f[1]) == 'subdir/..', 'failed to get dirname')
-else
-assert(fs.parent(f[1]) == 'subdir\..', 'failed to get dirname')
-endif
+assert(fs.parent(f[1]) == 'subdir/..', 'failed to get dirname for file')
 assert(fs.parent(btgt) == '.', 'failed to get dirname for build target')
 assert(fs.parent(ctgt) == '.', 'failed to get dirname for custom target')
 assert(fs.parent(ctgt[0]) == '.', 'failed to get dirname for custom target index')
@@ -153,8 +150,10 @@ assert(fs.name(f[1]) == 'meson.build', 'failed to get basename')
 assert(fs.name('foo/bar/baz.dll.a') == 'baz.dll.a', 'failed to get basename with compound suffix')
 if host_machine.system() in ['cygwin', 'windows']
   assert(fs.name(btgt) == 'btgt.exe', 'failed to get basename of build target')
+  assert(fs.suffix(btgt) == '.exe', 'failed to get build target suffix')
 else
   assert(fs.name(btgt) == 'btgt', 'failed to get basename of build target')
+  assert(fs.suffix(btgt) == '', 'failed to get build target suffix')
 endif
 assert(fs.name(ctgt) == 'ctgt.txt', 'failed to get basename of custom target')
 assert(fs.name(ctgt[0]) == 'ctgt.txt', 'failed to get basename of custom target index')
@@ -163,6 +162,12 @@ assert(fs.stem('foo/bar/baz.dll.a') == 'baz.dll', 'failed to get stem with compo
 assert(fs.stem(btgt) == 'btgt', 'failed to get stem of build target')
 assert(fs.stem(ctgt) == 'ctgt', 'failed to get stem of custom target')
 assert(fs.stem(ctgt[0]) == 'ctgt', 'failed to get stem of custom target index')
+assert(fs.suffix('foo/bar/baz') == '', 'failed to get missing suffix')
+assert(fs.suffix('foo/bar/baz.') == '.', 'failed to get empty suffix')
+assert(fs.suffix('foo/bar/baz.dll') == '.dll', 'failed to get plain suffix')
+assert(fs.suffix('foo/bar/baz.dll.a') == '.a', 'failed to get final suffix')
+assert(fs.suffix(ctgt) == '.txt', 'failed to get suffix of custom target')
+assert(fs.suffix(ctgt[0]) == '.txt', 'failed to get suffix of custom target index')
 
 # relative_to
 if build_machine.system() == 'windows'
diff --git a/test cases/common/282 wrap override/meson.build b/test cases/common/282 wrap override/meson.build
new file mode 100644
index 0000000..76c84d6
--- /dev/null
+++ b/test cases/common/282 wrap override/meson.build
@@ -0,0 +1,8 @@
+project('wrap override')
+
+
+subproject('sub')
+
+# sub has subsub.wrap that provides subsub-1.0 dependency. Even if sub itself
+# does not use it, that dependency should now be available.
+dependency('subsub-1.0')
diff --git a/test cases/common/282 wrap override/subprojects/sub/meson.build b/test cases/common/282 wrap override/subprojects/sub/meson.build
new file mode 100644
index 0000000..abefb30
--- /dev/null
+++ b/test cases/common/282 wrap override/subprojects/sub/meson.build
@@ -0,0 +1,7 @@
+project('sub')
+
+# Simulate an optional feature that requires subsub.wrap, but that feature is
+# not enabled.
+if false
+  dependency('subsub-1.0')
+endif
diff --git a/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap b/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap
new file mode 100644
index 0000000..85a1a7c
--- /dev/null
+++ b/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap
@@ -0,0 +1,5 @@
+[wrap-file]
+
+
+[provide]
+dependency_names = subsub-1.0
diff --git a/test cases/common/282 wrap override/subprojects/subsub/meson.build b/test cases/common/282 wrap override/subprojects/subsub/meson.build
new file mode 100644
index 0000000..668dcb3
--- /dev/null
+++ b/test cases/common/282 wrap override/subprojects/subsub/meson.build
@@ -0,0 +1,5 @@
+project('sub')
+
+# This simulates a subproject we previously downloaded using
+# subproject/sub/subproject/subsub.wrap
+meson.override_dependency('subsub-1.0', declare_dependency())
diff --git a/test cases/common/283 pkgconfig subproject/meson.build b/test cases/common/283 pkgconfig subproject/meson.build
new file mode 100644
index 0000000..3b1335b
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/meson.build
@@ -0,0 +1,13 @@
+project('simple', 'c', meson_version: '>=1.9.0')
+pkgg = import('pkgconfig')
+
+simple2_dep = dependency('simple2')
+
+simple_lib = library('simple',
+    'simple.c',
+    dependencies: [simple2_dep]
+)
+
+pkgg.generate(simple_lib,
+requires: simple2_dep,
+)
diff --git a/test cases/common/283 pkgconfig subproject/simple.c b/test cases/common/283 pkgconfig subproject/simple.c
new file mode 100644
index 0000000..da1d909
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/simple.c
@@ -0,0 +1,6 @@
+#include"simple.h"
+#include <simple2.h>
+
+int simple_function(void) {
+    return simple_simple_function();
+}
diff --git a/test cases/common/283 pkgconfig subproject/simple.h b/test cases/common/283 pkgconfig subproject/simple.h
new file mode 100644
index 0000000..6896bfd
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/simple.h
@@ -0,0 +1,6 @@
+#ifndef SIMPLE_H_
+#define SIMPLE_H_
+
+int simple_function(void);
+
+#endif
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/exports.def b/test cases/common/283 pkgconfig subproject/subprojects/simple2/exports.def
new file mode 100644
index 0000000..42c911b
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/subprojects/simple2/exports.def
@@ -0,0 +1,2 @@
+EXPORTS
+    simple_simple_function  @1
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/meson.build b/test cases/common/283 pkgconfig subproject/subprojects/simple2/meson.build
new file mode 100644
index 0000000..199fea6
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/subprojects/simple2/meson.build
@@ -0,0 +1,9 @@
+project('simple2', 'c', meson_version: '>=1.9.0')
+pkgg = import('pkgconfig')
+
+lib2 = library('simple2', 'simple2.c', vs_module_defs: 'exports.def')
+lib_dep = declare_dependency(link_with: lib2, include_directories: include_directories('.'))
+
+pkgg.generate(lib2)
+
+meson.override_dependency('simple2', lib_dep)
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.c b/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.c
new file mode 100644
index 0000000..215b2ae
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.c
@@ -0,0 +1,5 @@
+#include"simple2.h"
+
+int simple_simple_function(void) {
+    return 42;
+}
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.h b/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.h
new file mode 100644
index 0000000..472e135
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.h
@@ -0,0 +1,6 @@
+#ifndef SIMPLE2_H_
+#define SIMPLE2_H_
+
+int simple_simple_function(void);
+
+#endif
diff --git a/test cases/common/283 pkgconfig subproject/test.json b/test cases/common/283 pkgconfig subproject/test.json
new file mode 100644
index 0000000..db6b52f
--- /dev/null
+++ b/test cases/common/283 pkgconfig subproject/test.json
@@ -0,0 +1,15 @@
+{
+    "installed": [
+        { "type": "file", "file": "usr/lib/pkgconfig/simple.pc"},
+        { "type": "file", "file": "usr/lib/pkgconfig/simple2.pc"}
+    ],
+    "matrix": {
+        "options": {
+            "default_library": [
+                { "val": "shared" },
+                { "val": "static" },
+                { "val": "both" }
+            ]
+        }
+    }
+}
diff --git a/test cases/common/56 array methods/meson.build b/test cases/common/56 array methods/meson.build
index e9e4969..3707775 100644
--- a/test cases/common/56 array methods/meson.build
+++ b/test cases/common/56 array methods/meson.build
@@ -1,4 +1,4 @@
-project('array methods')
+project('array methods', meson_version : '>= 1.9')
 
 empty = []
 one = ['abc']
@@ -68,3 +68,10 @@ endif
 if not combined.contains('ghi')
   error('Combined claims not to contain ghi.')
 endif
+
+# test array flattening
+x = ['a', ['b'], [[[[[[['c'], 'd']]], 'e']]]]
+assert(x.length() == 3)
+assert(x.flatten().length() == 5)
+assert(x.flatten() == ['a', 'b', 'c', 'd', 'e'])
+assert(['a', ['b', 'c']].flatten() == ['a', 'b', 'c'])
diff --git a/test cases/cython/2 generated sources/meson.build b/test cases/cython/2 generated sources/meson.build
index d438d80..3d2837d 100644
--- a/test cases/cython/2 generated sources/meson.build
+++ b/test cases/cython/2 generated sources/meson.build
@@ -79,13 +79,20 @@ stuff_pxi = fs.copyfile(
   'stuff.pxi'
 )
 
+stuff_pxi_2 = configure_file(
+  input: 'stuff.pxi.in',
+  output: 'stuff.pxi',
+  configuration: configuration_data(),
+  install: false
+)
+
 # Need to copy the cython source to the build directory
 # since meson can only generate the .pxi there
 includestuff_pyx = fs.copyfile(
   'includestuff.pyx'
 )
 
-stuff_pxi_dep = declare_dependency(sources: stuff_pxi)
+stuff_pxi_dep = declare_dependency(sources: [stuff_pxi, stuff_pxi_2])
 
 includestuff_ext = py3.extension_module(
   'includestuff',
diff --git a/test cases/failing/135 rust link_language/f.rs b/test cases/failing/135 rust link_language/f.rs
new file mode 100644
index 0000000..da0f5d9
--- /dev/null
+++ b/test cases/failing/135 rust link_language/f.rs
@@ -0,0 +1 @@
+pub fn main() {}
diff --git a/test cases/failing/135 rust link_language/meson.build b/test cases/failing/135 rust link_language/meson.build
new file mode 100644
index 0000000..695f9c4
--- /dev/null
+++ b/test cases/failing/135 rust link_language/meson.build
@@ -0,0 +1,10 @@
+# SPDX-license-identifer: Apache-2.0
+# Copyright © 2021 Intel Corporation
+
+project('rust wrong link language')
+
+if not add_languages('rust', required: false)
+  error('MESON_SKIP_TEST test requires rust compiler')
+endif
+
+executable('f', 'f.rs', link_language: 'c')
diff --git a/test cases/failing/135 rust link_language/test.json b/test cases/failing/135 rust link_language/test.json
new file mode 100644
index 0000000..c72bb05
--- /dev/null
+++ b/test cases/failing/135 rust link_language/test.json
@@ -0,0 +1,8 @@
+{
+    "stdout": [
+        {
+            "line": "test cases/failing/135 rust link_language/meson.build:10:0: ERROR: cannot build Rust sources with a different link_language"
+        }
+    ]
+}
+
diff --git a/test cases/frameworks/25 hdf5/meson.build b/test cases/frameworks/25 hdf5/meson.build
index 38e0012..095c63f 100644
--- a/test cases/frameworks/25 hdf5/meson.build
+++ b/test cases/frameworks/25 hdf5/meson.build
@@ -28,6 +28,7 @@ test_fortran = add_languages('fortran', required: false)
 if test_fortran
   cpp = meson.get_compiler('cpp')
   fc = meson.get_compiler('fortran')
+  fs = import('fs')
 
   if host_machine.system() == 'darwin' and cpp.get_id() == 'clang' and fc.get_id() == 'gcc'
     # Search paths don't work correctly here and -lgfortran doesn't work
@@ -35,6 +36,10 @@ if test_fortran
   elif host_machine.system() == 'windows' and cpp.get_id() != 'gcc' and fc.get_id() == 'gcc'
     # mixing gfortran with non-gcc doesn't work on windows
     test_fortran = false
+  elif fs.is_dir('/ci') and '-I' not in run_command('h5fc', '-show').stdout()
+    # h5fc does not include needed -I flags when HDF5 is built using CMake
+    # https://github.com/HDFGroup/hdf5/issues/5660
+    test_fortran = false
   endif
 
   # --- Fortran tests
diff --git a/test cases/rewrite/7 tricky dataflow/addSrc.json b/test cases/rewrite/8 tricky dataflow/addSrc.json
index 17e4292..17e4292 100644
--- a/test cases/rewrite/7 tricky dataflow/addSrc.json
+++ b/test cases/rewrite/8 tricky dataflow/addSrc.json
diff --git a/test cases/rewrite/7 tricky dataflow/info.json b/test cases/rewrite/8 tricky dataflow/info.json
index 8d4ac55..8d4ac55 100644
--- a/test cases/rewrite/7 tricky dataflow/info.json
+++ b/test cases/rewrite/8 tricky dataflow/info.json
diff --git a/test cases/rewrite/7 tricky dataflow/meson.build b/test cases/rewrite/8 tricky dataflow/meson.build
index ab572ea..ab572ea 100644
--- a/test cases/rewrite/7 tricky dataflow/meson.build
+++ b/test cases/rewrite/8 tricky dataflow/meson.build
diff --git a/test cases/rust/1 basic/meson.build b/test cases/rust/1 basic/meson.build
index f422beb..00bd212 100644
--- a/test cases/rust/1 basic/meson.build
+++ b/test cases/rust/1 basic/meson.build
@@ -6,6 +6,12 @@ e = executable('rust-program', 'prog.rs',
 )
 test('rusttest', e)
 
+e = executable('rust-dynamic', 'prog.rs',
+  override_options: {'rust_dynamic_std': true},
+  install : true
+)
+test('rusttest-dynamic', e)
+
 subdir('subdir')
 
 # this should fail due to debug_assert
diff --git a/test cases/rust/1 basic/test.json b/test cases/rust/1 basic/test.json
index 95e6ced..3cbdefa 100644
--- a/test cases/rust/1 basic/test.json
+++ b/test cases/rust/1 basic/test.json
@@ -3,6 +3,8 @@
     {"type": "exe", "file": "usr/bin/rust-program"},
     {"type": "pdb", "file": "usr/bin/rust-program"},
     {"type": "exe", "file": "usr/bin/rust-program2"},
-    {"type": "pdb", "file": "usr/bin/rust-program2"}
+    {"type": "pdb", "file": "usr/bin/rust-program2"},
+    {"type": "exe", "file": "usr/bin/rust-dynamic"},
+    {"type": "pdb", "file": "usr/bin/rust-dynamic"}
   ]
 }
diff --git a/test cases/rust/22 cargo subproject/meson.build b/test cases/rust/22 cargo subproject/meson.build
index 1b60014..7e2c662 100644
--- a/test cases/rust/22 cargo subproject/meson.build
+++ b/test cases/rust/22 cargo subproject/meson.build
@@ -1,6 +1,6 @@
 project('cargo subproject', 'c')
 
-foo_dep = dependency('foo-0-rs')
+foo_dep = dependency('foo-0-cdylib')
 exe = executable('app', 'main.c',
   dependencies: foo_dep,
 )
diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap
index 99686e9..d12172b 100644
--- a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap
+++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs.wrap
@@ -1,2 +1,5 @@
 [wrap-file]
 method = cargo
+
+[provide]
+dependency_names = foo-0-cdylib
diff --git a/test cases/rust/28 mixed/hello.rs b/test cases/rust/28 mixed/hello.rs
new file mode 100644
index 0000000..549fa94
--- /dev/null
+++ b/test cases/rust/28 mixed/hello.rs
@@ -0,0 +1,6 @@
+#![no_main]
+
+#[no_mangle]
+pub extern "C" fn hello_rust() {
+    println!("hello world");
+}
diff --git a/test cases/rust/28 mixed/main.cc b/test cases/rust/28 mixed/main.cc
new file mode 100644
index 0000000..10daae4
--- /dev/null
+++ b/test cases/rust/28 mixed/main.cc
@@ -0,0 +1,5 @@
+#include <iostream>
+
+extern "C" void hello_rust(void);
+
+int main() { std::cout << "This is C++!\n"; hello_rust(); }
diff --git a/test cases/rust/28 mixed/meson.build b/test cases/rust/28 mixed/meson.build
new file mode 100644
index 0000000..fac3d46
--- /dev/null
+++ b/test cases/rust/28 mixed/meson.build
@@ -0,0 +1,12 @@
+# use C++ to make it harder
+project('mixed', ['cpp', 'rust'])
+
+e1 = executable('mixed', 'hello.rs', 'main.cc')
+e2 = executable('mixed-structured', structured_sources('hello.rs'), 'main.cc')
+
+hello2 = import('fs').copyfile('hello.rs', 'hello2.rs')
+e3 = executable('mixed-structured-gen', structured_sources(hello2), 'main.cc')
+
+test('mixed', e1)
+test('mixed-structured', e2)
+test('mixed-structured-gen', e3)
diff --git a/test cases/rust/4 polyglot/stuff.rs b/test cases/rust/4 polyglot/stuff.rs
index 30c3a36..e5d9386 100644
--- a/test cases/rust/4 polyglot/stuff.rs
+++ b/test cases/rust/4 polyglot/stuff.rs
@@ -1,4 +1,4 @@
 #[no_mangle]
-pub extern fn f() {
+pub extern "C" fn f() {
     println!("Hello from Rust!");
 }
diff --git a/test cases/rust/9 unit tests/meson.build b/test cases/rust/9 unit tests/meson.build
index 0fa2fa8..81045f2 100644
--- a/test cases/rust/9 unit tests/meson.build
+++ b/test cases/rust/9 unit tests/meson.build
@@ -40,6 +40,12 @@ if rustdoc.found()
     protocol : 'rust',
     suite : ['doctests'],
   )
+
+  doclib = shared_library('rust_doc_lib', ['doctest1.rs'], build_by_default : false)
+  rust.doctest('rust shared doctests', doclib,
+    protocol : 'rust',
+    suite : ['doctests'],
+  )
 endif
 
 exe = executable('rust_exe', ['test2.rs', 'test.rs'], build_by_default : false)
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
diff --git a/test cases/unit/99 custom target name/file.txt.in b/test cases/unit/100 custom target name/file.txt.in
index e69de29..e69de29 100644
--- a/test cases/unit/99 custom target name/file.txt.in
+++ b/test cases/unit/100 custom target name/file.txt.in
diff --git a/test cases/unit/99 custom target name/meson.build b/test cases/unit/100 custom target name/meson.build
index 8287614..8287614 100644
--- a/test cases/unit/99 custom target name/meson.build
+++ b/test cases/unit/100 custom target name/meson.build
diff --git a/test cases/unit/99 custom target name/subdir/meson.build b/test cases/unit/100 custom target name/subdir/meson.build
index 785a7b3..785a7b3 100644
--- a/test cases/unit/99 custom target name/subdir/meson.build
+++ b/test cases/unit/100 custom target name/subdir/meson.build
diff --git a/test cases/unit/100 relative find program/foo.py b/test cases/unit/101 relative find program/foo.py
index 21239b7..21239b7 100755
--- a/test cases/unit/100 relative find program/foo.py
+++ b/test cases/unit/101 relative find program/foo.py
diff --git a/test cases/unit/100 relative find program/meson.build b/test cases/unit/101 relative find program/meson.build
index 5745d8a..5745d8a 100644
--- a/test cases/unit/100 relative find program/meson.build
+++ b/test cases/unit/101 relative find program/meson.build
diff --git a/test cases/unit/100 relative find program/subdir/meson.build b/test cases/unit/101 relative find program/subdir/meson.build
index 475f5f5..475f5f5 100644
--- a/test cases/unit/100 relative find program/subdir/meson.build
+++ b/test cases/unit/101 relative find program/subdir/meson.build
diff --git a/test cases/unit/101 rlib linkage/lib2.rs b/test cases/unit/102 rlib linkage/lib2.rs
index 3487bc5..3487bc5 100644
--- a/test cases/unit/101 rlib linkage/lib2.rs
+++ b/test cases/unit/102 rlib linkage/lib2.rs
diff --git a/test cases/unit/101 rlib linkage/main.rs b/test cases/unit/102 rlib linkage/main.rs
index d0f82e4..d0f82e4 100644
--- a/test cases/unit/101 rlib linkage/main.rs
+++ b/test cases/unit/102 rlib linkage/main.rs
diff --git a/test cases/unit/101 rlib linkage/meson.build b/test cases/unit/102 rlib linkage/meson.build
index 2d15b2a..2d15b2a 100644
--- a/test cases/unit/101 rlib linkage/meson.build
+++ b/test cases/unit/102 rlib linkage/meson.build
diff --git a/test cases/unit/102 python without pkgconfig/meson.build b/test cases/unit/103 python without pkgconfig/meson.build
index 014a617..014a617 100644
--- a/test cases/unit/102 python without pkgconfig/meson.build
+++ b/test cases/unit/103 python without pkgconfig/meson.build
diff --git a/test cases/unit/103 strip/lib.c b/test cases/unit/104 strip/lib.c
index 7d8163c..7d8163c 100644
--- a/test cases/unit/103 strip/lib.c
+++ b/test cases/unit/104 strip/lib.c
diff --git a/test cases/unit/103 strip/meson.build b/test cases/unit/104 strip/meson.build
index dff61ab..dff61ab 100644
--- a/test cases/unit/103 strip/meson.build
+++ b/test cases/unit/104 strip/meson.build
diff --git a/test cases/unit/104 debug function/meson.build b/test cases/unit/105 debug function/meson.build
index c3f4c76..c3f4c76 100644
--- a/test cases/unit/104 debug function/meson.build
+++ b/test cases/unit/105 debug function/meson.build
diff --git a/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
index ff21286..ff21286 100644
--- a/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
+++ b/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/106 underspecified mtest/main.c b/test cases/unit/107 underspecified mtest/main.c
index 8842fc1..8842fc1 100644
--- a/test cases/unit/106 underspecified mtest/main.c
+++ b/test cases/unit/107 underspecified mtest/main.c
diff --git a/test cases/unit/106 underspecified mtest/meson.build b/test cases/unit/107 underspecified mtest/meson.build
index c0a88d6..c0a88d6 100644
--- a/test cases/unit/106 underspecified mtest/meson.build
+++ b/test cases/unit/107 underspecified mtest/meson.build
diff --git a/test cases/unit/106 underspecified mtest/runner.py b/test cases/unit/107 underspecified mtest/runner.py
index 9fb9ac4..9fb9ac4 100755
--- a/test cases/unit/106 underspecified mtest/runner.py
+++ b/test cases/unit/107 underspecified mtest/runner.py
diff --git a/test cases/unit/107 subproject symlink/cp.py b/test cases/unit/108 subproject symlink/cp.py
index adb0547..adb0547 100644
--- a/test cases/unit/107 subproject symlink/cp.py
+++ b/test cases/unit/108 subproject symlink/cp.py
diff --git a/test cases/unit/107 subproject symlink/main.c b/test cases/unit/108 subproject symlink/main.c
index 62bd4b4..62bd4b4 100644
--- a/test cases/unit/107 subproject symlink/main.c
+++ b/test cases/unit/108 subproject symlink/main.c
diff --git a/test cases/unit/107 subproject symlink/meson.build b/test cases/unit/108 subproject symlink/meson.build
index 6766c8e..6766c8e 100644
--- a/test cases/unit/107 subproject symlink/meson.build
+++ b/test cases/unit/108 subproject symlink/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile b/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/datafile
index 6a68294..6a68294 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile
+++ b/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/datafile
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build b/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/meson.build
index cbeb0a9..cbeb0a9 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build
+++ b/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build b/test cases/unit/108 subproject symlink/symlinked_subproject/meson.build
index 3930465..3930465 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build
+++ b/test cases/unit/108 subproject symlink/symlinked_subproject/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/src.c b/test cases/unit/108 subproject symlink/symlinked_subproject/src.c
index 97d7ad1..97d7ad1 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/src.c
+++ b/test cases/unit/108 subproject symlink/symlinked_subproject/src.c
diff --git a/test cases/unit/108 new subproject on reconfigure/meson.build b/test cases/unit/109 new subproject on reconfigure/meson.build
index 7342c9a..7342c9a 100644
--- a/test cases/unit/108 new subproject on reconfigure/meson.build
+++ b/test cases/unit/109 new subproject on reconfigure/meson.build
diff --git a/test cases/unit/108 new subproject on reconfigure/meson_options.txt b/test cases/unit/109 new subproject on reconfigure/meson_options.txt
index b3dd683..b3dd683 100644
--- a/test cases/unit/108 new subproject on reconfigure/meson_options.txt
+++ b/test cases/unit/109 new subproject on reconfigure/meson_options.txt
diff --git a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c b/test cases/unit/109 new subproject on reconfigure/subprojects/foo/foo.c
index 1edf995..1edf995 100644
--- a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c
+++ b/test cases/unit/109 new subproject on reconfigure/subprojects/foo/foo.c
diff --git a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build b/test cases/unit/109 new subproject on reconfigure/subprojects/foo/meson.build
index 2a6e30a..2a6e30a 100644
--- a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build
+++ b/test cases/unit/109 new subproject on reconfigure/subprojects/foo/meson.build
diff --git a/test cases/unit/109 configure same noop/meson.build b/test cases/unit/110 configure same noop/meson.build
index d3f1326..d3f1326 100644
--- a/test cases/unit/109 configure same noop/meson.build
+++ b/test cases/unit/110 configure same noop/meson.build
diff --git a/test cases/unit/109 configure same noop/meson_options.txt b/test cases/unit/110 configure same noop/meson_options.txt
index 57b4084..57b4084 100644
--- a/test cases/unit/109 configure same noop/meson_options.txt
+++ b/test cases/unit/110 configure same noop/meson_options.txt
diff --git a/test cases/unit/110 freeze/freeze.c b/test cases/unit/111 freeze/freeze.c
index 0a45c1a..0a45c1a 100644
--- a/test cases/unit/110 freeze/freeze.c
+++ b/test cases/unit/111 freeze/freeze.c
diff --git a/test cases/unit/110 freeze/meson.build b/test cases/unit/111 freeze/meson.build
index 1a84f37..1a84f37 100644
--- a/test cases/unit/110 freeze/meson.build
+++ b/test cases/unit/111 freeze/meson.build
diff --git a/test cases/unit/111 replace unencodable xml chars/meson.build b/test cases/unit/112 replace unencodable xml chars/meson.build
index 73485b0..73485b0 100644
--- a/test cases/unit/111 replace unencodable xml chars/meson.build
+++ b/test cases/unit/112 replace unencodable xml chars/meson.build
diff --git a/test cases/unit/111 replace unencodable xml chars/script.py b/test cases/unit/112 replace unencodable xml chars/script.py
index 2f2d4d6..2f2d4d6 100644
--- a/test cases/unit/111 replace unencodable xml chars/script.py
+++ b/test cases/unit/112 replace unencodable xml chars/script.py
diff --git a/test cases/unit/112 classpath/com/mesonbuild/Simple.java b/test cases/unit/113 classpath/com/mesonbuild/Simple.java
index 325a49a..325a49a 100644
--- a/test cases/unit/112 classpath/com/mesonbuild/Simple.java
+++ b/test cases/unit/113 classpath/com/mesonbuild/Simple.java
diff --git a/test cases/unit/112 classpath/meson.build b/test cases/unit/113 classpath/meson.build
index e6b9b84..e6b9b84 100644
--- a/test cases/unit/112 classpath/meson.build
+++ b/test cases/unit/113 classpath/meson.build
diff --git a/test cases/unit/113 list build options/meson.build b/test cases/unit/114 list build options/meson.build
index 2d634d3..2d634d3 100644
--- a/test cases/unit/113 list build options/meson.build
+++ b/test cases/unit/114 list build options/meson.build
diff --git a/test cases/unit/113 list build options/meson_options.txt b/test cases/unit/114 list build options/meson_options.txt
index d84f22a..d84f22a 100644
--- a/test cases/unit/113 list build options/meson_options.txt
+++ b/test cases/unit/114 list build options/meson_options.txt
diff --git a/test cases/unit/114 complex link cases/main.c b/test cases/unit/115 complex link cases/main.c
index 739b413..739b413 100644
--- a/test cases/unit/114 complex link cases/main.c
+++ b/test cases/unit/115 complex link cases/main.c
diff --git a/test cases/unit/114 complex link cases/meson.build b/test cases/unit/115 complex link cases/meson.build
index 3b4b898..3b4b898 100644
--- a/test cases/unit/114 complex link cases/meson.build
+++ b/test cases/unit/115 complex link cases/meson.build
diff --git a/test cases/unit/114 complex link cases/s1.c b/test cases/unit/115 complex link cases/s1.c
index 68bba49..68bba49 100644
--- a/test cases/unit/114 complex link cases/s1.c
+++ b/test cases/unit/115 complex link cases/s1.c
diff --git a/test cases/unit/114 complex link cases/s2.c b/test cases/unit/115 complex link cases/s2.c
index 835870c..835870c 100644
--- a/test cases/unit/114 complex link cases/s2.c
+++ b/test cases/unit/115 complex link cases/s2.c
diff --git a/test cases/unit/114 complex link cases/s3.c b/test cases/unit/115 complex link cases/s3.c
index 08e0620..08e0620 100644
--- a/test cases/unit/114 complex link cases/s3.c
+++ b/test cases/unit/115 complex link cases/s3.c
diff --git a/test cases/unit/115 c cpp stds/meson.build b/test cases/unit/116 c cpp stds/meson.build
index fb68af6..fb68af6 100644
--- a/test cases/unit/115 c cpp stds/meson.build
+++ b/test cases/unit/116 c cpp stds/meson.build
diff --git a/test cases/unit/115 c cpp stds/meson.options b/test cases/unit/116 c cpp stds/meson.options
index 7040758..7040758 100644
--- a/test cases/unit/115 c cpp stds/meson.options
+++ b/test cases/unit/116 c cpp stds/meson.options
diff --git a/test cases/unit/116 empty project/expected_mods.json b/test cases/unit/117 empty project/expected_mods.json
index fa5e0ec..fa5e0ec 100644
--- a/test cases/unit/116 empty project/expected_mods.json
+++ b/test cases/unit/117 empty project/expected_mods.json
diff --git a/test cases/unit/116 empty project/meson.build b/test cases/unit/117 empty project/meson.build
index b92b9b4..b92b9b4 100644
--- a/test cases/unit/116 empty project/meson.build
+++ b/test cases/unit/117 empty project/meson.build
diff --git a/test cases/unit/117 genvslite/main.cpp b/test cases/unit/118 genvslite/main.cpp
index ca250bd..ca250bd 100644
--- a/test cases/unit/117 genvslite/main.cpp
+++ b/test cases/unit/118 genvslite/main.cpp
diff --git a/test cases/unit/117 genvslite/meson.build b/test cases/unit/118 genvslite/meson.build
index 3445d7f..3445d7f 100644
--- a/test cases/unit/117 genvslite/meson.build
+++ b/test cases/unit/118 genvslite/meson.build
diff --git a/test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build b/test cases/unit/119 meson package cache dir/cache_dir/bar/meson.build
index dca36f6..dca36f6 100644
--- a/test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build
+++ b/test cases/unit/119 meson package cache dir/cache_dir/bar/meson.build
diff --git a/test cases/unit/118 meson package cache dir/cache_dir/foo.zip b/test cases/unit/119 meson package cache dir/cache_dir/foo.zip
index 91bc36a..91bc36a 100644
--- a/test cases/unit/118 meson package cache dir/cache_dir/foo.zip
+++ b/test cases/unit/119 meson package cache dir/cache_dir/foo.zip
diff --git a/test cases/unit/118 meson package cache dir/meson.build b/test cases/unit/119 meson package cache dir/meson.build
index 2057bba..2057bba 100644
--- a/test cases/unit/118 meson package cache dir/meson.build
+++ b/test cases/unit/119 meson package cache dir/meson.build
diff --git a/test cases/unit/118 meson package cache dir/subprojects/bar.wrap b/test cases/unit/119 meson package cache dir/subprojects/bar.wrap
index 3ec5834..3ec5834 100644
--- a/test cases/unit/118 meson package cache dir/subprojects/bar.wrap
+++ b/test cases/unit/119 meson package cache dir/subprojects/bar.wrap
diff --git a/test cases/unit/118 meson package cache dir/subprojects/foo.wrap b/test cases/unit/119 meson package cache dir/subprojects/foo.wrap
index b7dd41d..b7dd41d 100644
--- a/test cases/unit/118 meson package cache dir/subprojects/foo.wrap
+++ b/test cases/unit/119 meson package cache dir/subprojects/foo.wrap
diff --git a/test cases/unit/119 openssl cmake bug/meson.build b/test cases/unit/120 openssl cmake bug/meson.build
index d08a8ef..d08a8ef 100644
--- a/test cases/unit/119 openssl cmake bug/meson.build
+++ b/test cases/unit/120 openssl cmake bug/meson.build
diff --git a/test cases/unit/119 openssl cmake bug/nativefile.ini b/test cases/unit/120 openssl cmake bug/nativefile.ini
index dd6b0ff..dd6b0ff 100644
--- a/test cases/unit/119 openssl cmake bug/nativefile.ini
+++ b/test cases/unit/120 openssl cmake bug/nativefile.ini
diff --git a/test cases/unit/120 rewrite/meson.build b/test cases/unit/121 rewrite/meson.build
index 654b09d..654b09d 100644
--- a/test cases/unit/120 rewrite/meson.build
+++ b/test cases/unit/121 rewrite/meson.build
diff --git a/test cases/unit/121 executable suffix/main.c b/test cases/unit/122 executable suffix/main.c
index 78f2de1..78f2de1 100644
--- a/test cases/unit/121 executable suffix/main.c
+++ b/test cases/unit/122 executable suffix/main.c
diff --git a/test cases/unit/121 executable suffix/meson.build b/test cases/unit/122 executable suffix/meson.build
index 7dff9d6..7dff9d6 100644
--- a/test cases/unit/121 executable suffix/meson.build
+++ b/test cases/unit/122 executable suffix/meson.build
diff --git a/test cases/unit/122 persp options/meson.build b/test cases/unit/123 persp options/meson.build
index 2df4205..2df4205 100644
--- a/test cases/unit/122 persp options/meson.build
+++ b/test cases/unit/123 persp options/meson.build
diff --git a/test cases/unit/122 persp options/meson.options b/test cases/unit/123 persp options/meson.options
index 2bfd08d..2bfd08d 100644
--- a/test cases/unit/122 persp options/meson.options
+++ b/test cases/unit/123 persp options/meson.options
diff --git a/test cases/unit/122 persp options/subprojects/sub1/meson.build b/test cases/unit/123 persp options/subprojects/sub1/meson.build
index 5b17618..5b17618 100644
--- a/test cases/unit/122 persp options/subprojects/sub1/meson.build
+++ b/test cases/unit/123 persp options/subprojects/sub1/meson.build
diff --git a/test cases/unit/122 persp options/subprojects/sub1/meson.options b/test cases/unit/123 persp options/subprojects/sub1/meson.options
index ba5661a..ba5661a 100644
--- a/test cases/unit/122 persp options/subprojects/sub1/meson.options
+++ b/test cases/unit/123 persp options/subprojects/sub1/meson.options
diff --git a/test cases/unit/122 persp options/subprojects/sub1/sub1.c b/test cases/unit/123 persp options/subprojects/sub1/sub1.c
index 4e4b873..4e4b873 100644
--- a/test cases/unit/122 persp options/subprojects/sub1/sub1.c
+++ b/test cases/unit/123 persp options/subprojects/sub1/sub1.c
diff --git a/test cases/unit/122 persp options/subprojects/sub2/meson.build b/test cases/unit/123 persp options/subprojects/sub2/meson.build
index e8935bc..e8935bc 100644
--- a/test cases/unit/122 persp options/subprojects/sub2/meson.build
+++ b/test cases/unit/123 persp options/subprojects/sub2/meson.build
diff --git a/test cases/unit/122 persp options/subprojects/sub2/meson.options b/test cases/unit/123 persp options/subprojects/sub2/meson.options
index ba5661a..ba5661a 100644
--- a/test cases/unit/122 persp options/subprojects/sub2/meson.options
+++ b/test cases/unit/123 persp options/subprojects/sub2/meson.options
diff --git a/test cases/unit/122 persp options/subprojects/sub2/sub2.c b/test cases/unit/123 persp options/subprojects/sub2/sub2.c
index 4e4b873..4e4b873 100644
--- a/test cases/unit/122 persp options/subprojects/sub2/sub2.c
+++ b/test cases/unit/123 persp options/subprojects/sub2/sub2.c
diff --git a/test cases/unit/122 persp options/toplevel.c b/test cases/unit/123 persp options/toplevel.c
index 5748d6b..5748d6b 100644
--- a/test cases/unit/122 persp options/toplevel.c
+++ b/test cases/unit/123 persp options/toplevel.c
diff --git a/test cases/unit/123 reconfigure base options/meson.build b/test cases/unit/124 reconfigure base options/meson.build
index 8a13b78..8a13b78 100644
--- a/test cases/unit/123 reconfigure base options/meson.build
+++ b/test cases/unit/124 reconfigure base options/meson.build
diff --git a/test cases/unit/123 reconfigure base options/subprojects/sub/meson.build b/test cases/unit/124 reconfigure base options/subprojects/sub/meson.build
index ba740d1..ba740d1 100644
--- a/test cases/unit/123 reconfigure base options/subprojects/sub/meson.build
+++ b/test cases/unit/124 reconfigure base options/subprojects/sub/meson.build
diff --git a/test cases/unit/124 interactive tap/meson.build b/test cases/unit/125 interactive tap/meson.build
index 30518db..30518db 100644
--- a/test cases/unit/124 interactive tap/meson.build
+++ b/test cases/unit/125 interactive tap/meson.build
diff --git a/test cases/unit/124 interactive tap/script.py b/test cases/unit/125 interactive tap/script.py
index 873a4ae..873a4ae 100755
--- a/test cases/unit/124 interactive tap/script.py
+++ b/test cases/unit/125 interactive tap/script.py
diff --git a/test cases/unit/125 declare_dep var/meson.build b/test cases/unit/126 declare_dep var/meson.build
index 4909b59..4909b59 100644
--- a/test cases/unit/125 declare_dep var/meson.build
+++ b/test cases/unit/126 declare_dep var/meson.build
diff --git a/test cases/unit/125 declare_dep var/meson_options.txt b/test cases/unit/126 declare_dep var/meson_options.txt
index eb15ffc..eb15ffc 100644
--- a/test cases/unit/125 declare_dep var/meson_options.txt
+++ b/test cases/unit/126 declare_dep var/meson_options.txt
diff --git a/test cases/unit/125 pkgsubproj/meson.build b/test cases/unit/127 pkgsubproj/meson.build
index b4cf89f..b4cf89f 100644
--- a/test cases/unit/125 pkgsubproj/meson.build
+++ b/test cases/unit/127 pkgsubproj/meson.build
diff --git a/test cases/unit/125 pkgsubproj/subprojects/sub/meson.build b/test cases/unit/127 pkgsubproj/subprojects/sub/meson.build
index 99622b6..99622b6 100644
--- a/test cases/unit/125 pkgsubproj/subprojects/sub/meson.build
+++ b/test cases/unit/127 pkgsubproj/subprojects/sub/meson.build
diff --git a/test cases/unit/126 test slice/meson.build b/test cases/unit/128 test slice/meson.build
index a41c2f6..a41c2f6 100644
--- a/test cases/unit/126 test slice/meson.build
+++ b/test cases/unit/128 test slice/meson.build
diff --git a/test cases/unit/126 test slice/test.py b/test cases/unit/128 test slice/test.py
index e69de29..e69de29 100644
--- a/test cases/unit/126 test slice/test.py
+++ b/test cases/unit/128 test slice/test.py
diff --git a/test cases/unit/127 sanitizers/meson.build b/test cases/unit/129 sanitizers/meson.build
index b42fb35..b42fb35 100644
--- a/test cases/unit/127 sanitizers/meson.build
+++ b/test cases/unit/129 sanitizers/meson.build
diff --git a/test cases/unit/128 long opt vs D/meson.build b/test cases/unit/130 long opt vs D/meson.build
index e05d88d..e05d88d 100644
--- a/test cases/unit/128 long opt vs D/meson.build
+++ b/test cases/unit/130 long opt vs D/meson.build
diff --git a/test cases/unit/128 long opt vs D/meson_options.txt b/test cases/unit/130 long opt vs D/meson_options.txt
index 255bf15..255bf15 100644
--- a/test cases/unit/128 long opt vs D/meson_options.txt
+++ b/test cases/unit/130 long opt vs D/meson_options.txt
diff --git a/test cases/unit/129 vala internal glib/lib.vala b/test cases/unit/131 vala internal glib/lib.vala
index e62e632..e62e632 100644
--- a/test cases/unit/129 vala internal glib/lib.vala
+++ b/test cases/unit/131 vala internal glib/lib.vala
diff --git a/test cases/unit/129 vala internal glib/meson.build b/test cases/unit/131 vala internal glib/meson.build
index 9479082..9479082 100644
--- a/test cases/unit/129 vala internal glib/meson.build
+++ b/test cases/unit/131 vala internal glib/meson.build
diff --git a/test cases/unit/129 vala internal glib/meson.options b/test cases/unit/131 vala internal glib/meson.options
index f8a1ece..f8a1ece 100644
--- a/test cases/unit/129 vala internal glib/meson.options
+++ b/test cases/unit/131 vala internal glib/meson.options
diff --git a/test cases/unit/69 cross/crossfile.in b/test cases/unit/69 cross/crossfile.in
index 678e8d3..beab9bc 100644
--- a/test cases/unit/69 cross/crossfile.in
+++ b/test cases/unit/69 cross/crossfile.in
@@ -3,3 +3,6 @@ system = '@system@'
 cpu_family = '@cpu_family@'
 cpu = '@cpu@'
 endian = '@endian@'
+
+[built-in options]
+c_args = ['-funroll-loops']
diff --git a/test cases/unit/69 cross/meson.build b/test cases/unit/69 cross/meson.build
index acf4f0f..645d453 100644
--- a/test cases/unit/69 cross/meson.build
+++ b/test cases/unit/69 cross/meson.build
@@ -1,16 +1,25 @@
 project('crosstest')
 
+add_languages('c', native: true)
 if get_option('generate')
     conf_data = configuration_data()
     conf_data.set('system', build_machine.system())
     conf_data.set('cpu', build_machine.cpu())
     conf_data.set('cpu_family', build_machine.cpu_family())
     conf_data.set('endian', build_machine.endian())
+    conf_data.set('c_args', '-pedantic')
 
     configure_file(input: 'crossfile.in',
                 output: 'crossfile',
                 configuration: conf_data)
-    message('Written cross file')
+    configure_file(input: 'nativefile.in',
+                output: 'nativefile',
+                configuration: conf_data)
+    message('Written native and cross file')
+
+    add_languages('c', native: false)
+    assert(get_option('build.c_args') == get_option('c_args'))
 else
     assert(meson.is_cross_build(), 'not setup as cross build')
+    assert(get_option('build.c_args') == ['-pedantic'])
 endif
diff --git a/test cases/unit/69 cross/nativefile.in b/test cases/unit/69 cross/nativefile.in
new file mode 100644
index 0000000..9a63999
--- /dev/null
+++ b/test cases/unit/69 cross/nativefile.in
@@ -0,0 +1,2 @@
+[built-in options]
+build.c_args = ['@c_args@']
diff --git a/test cases/unit/91 install skip subprojects/foo.c b/test cases/unit/92 install skip subprojects/foo.c
index 25927f5..25927f5 100644
--- a/test cases/unit/91 install skip subprojects/foo.c
+++ b/test cases/unit/92 install skip subprojects/foo.c
diff --git a/test cases/unit/91 install skip subprojects/foo.dat b/test cases/unit/92 install skip subprojects/foo.dat
index 421376d..421376d 100644
--- a/test cases/unit/91 install skip subprojects/foo.dat
+++ b/test cases/unit/92 install skip subprojects/foo.dat
diff --git a/test cases/unit/91 install skip subprojects/foo.h b/test cases/unit/92 install skip subprojects/foo.h
index a7e26ac..a7e26ac 100644
--- a/test cases/unit/91 install skip subprojects/foo.h
+++ b/test cases/unit/92 install skip subprojects/foo.h
diff --git a/test cases/unit/91 install skip subprojects/foo/foofile b/test cases/unit/92 install skip subprojects/foo/foofile
index e69de29..e69de29 100644
--- a/test cases/unit/91 install skip subprojects/foo/foofile
+++ b/test cases/unit/92 install skip subprojects/foo/foofile
diff --git a/test cases/unit/91 install skip subprojects/meson.build b/test cases/unit/92 install skip subprojects/meson.build
index cfbae94..cfbae94 100644
--- a/test cases/unit/91 install skip subprojects/meson.build
+++ b/test cases/unit/92 install skip subprojects/meson.build
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
index 25927f5..25927f5 100644
--- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
+++ b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
index 421376d..421376d 100644
--- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
+++ b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
index a7e26ac..a7e26ac 100644
--- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
+++ b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile b/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
index 421376d..421376d 100644
--- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
+++ b/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build b/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
index b5b0734..b5b0734 100644
--- a/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
+++ b/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/92 new subproject in configured project/meson.build b/test cases/unit/93 new subproject in configured project/meson.build
index b82aa41..b82aa41 100644
--- a/test cases/unit/92 new subproject in configured project/meson.build
+++ b/test cases/unit/93 new subproject in configured project/meson.build
diff --git a/test cases/unit/92 new subproject in configured project/meson_options.txt b/test cases/unit/93 new subproject in configured project/meson_options.txt
index 12d8395..12d8395 100644
--- a/test cases/unit/92 new subproject in configured project/meson_options.txt
+++ b/test cases/unit/93 new subproject in configured project/meson_options.txt
diff --git a/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c b/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
index 9713d9f..9713d9f 100644
--- a/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
+++ b/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
diff --git a/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build b/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
index a833b0c..a833b0c 100644
--- a/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
+++ b/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
diff --git a/test cases/unit/93 clangformat/.clang-format b/test cases/unit/94 clangformat/.clang-format
index 689bc60..689bc60 100644
--- a/test cases/unit/93 clangformat/.clang-format
+++ b/test cases/unit/94 clangformat/.clang-format
diff --git a/test cases/unit/93 clangformat/.clang-format-ignore b/test cases/unit/94 clangformat/.clang-format-ignore
index 7fc4d5a..7fc4d5a 100644
--- a/test cases/unit/93 clangformat/.clang-format-ignore
+++ b/test cases/unit/94 clangformat/.clang-format-ignore
diff --git a/test cases/unit/93 clangformat/.clang-format-include b/test cases/unit/94 clangformat/.clang-format-include
index f057c00..f057c00 100644
--- a/test cases/unit/93 clangformat/.clang-format-include
+++ b/test cases/unit/94 clangformat/.clang-format-include
diff --git a/test cases/unit/93 clangformat/meson.build b/test cases/unit/94 clangformat/meson.build
index 8f4af98..8f4af98 100644
--- a/test cases/unit/93 clangformat/meson.build
+++ b/test cases/unit/94 clangformat/meson.build
diff --git a/test cases/unit/93 clangformat/not-included/badformat.cpp b/test cases/unit/94 clangformat/not-included/badformat.cpp
index 99a0ea6..99a0ea6 100644
--- a/test cases/unit/93 clangformat/not-included/badformat.cpp
+++ b/test cases/unit/94 clangformat/not-included/badformat.cpp
diff --git a/test cases/unit/93 clangformat/src/badformat.c b/test cases/unit/94 clangformat/src/badformat.c
index f1d18b7..f1d18b7 100644
--- a/test cases/unit/93 clangformat/src/badformat.c
+++ b/test cases/unit/94 clangformat/src/badformat.c
diff --git a/test cases/unit/93 clangformat/src/badformat.cpp b/test cases/unit/94 clangformat/src/badformat.cpp
index 99a0ea6..99a0ea6 100644
--- a/test cases/unit/93 clangformat/src/badformat.cpp
+++ b/test cases/unit/94 clangformat/src/badformat.cpp
diff --git a/test cases/unit/94 custominc/easytogrepfor/genh.py b/test cases/unit/95 custominc/easytogrepfor/genh.py
index 48e033a..48e033a 100644
--- a/test cases/unit/94 custominc/easytogrepfor/genh.py
+++ b/test cases/unit/95 custominc/easytogrepfor/genh.py
diff --git a/test cases/unit/94 custominc/easytogrepfor/meson.build b/test cases/unit/95 custominc/easytogrepfor/meson.build
index e749753..e749753 100644
--- a/test cases/unit/94 custominc/easytogrepfor/meson.build
+++ b/test cases/unit/95 custominc/easytogrepfor/meson.build
diff --git a/test cases/unit/94 custominc/helper.c b/test cases/unit/95 custominc/helper.c
index 3237441..3237441 100644
--- a/test cases/unit/94 custominc/helper.c
+++ b/test cases/unit/95 custominc/helper.c
diff --git a/test cases/unit/94 custominc/meson.build b/test cases/unit/95 custominc/meson.build
index bab1139..bab1139 100644
--- a/test cases/unit/94 custominc/meson.build
+++ b/test cases/unit/95 custominc/meson.build
diff --git a/test cases/unit/94 custominc/prog.c b/test cases/unit/95 custominc/prog.c
index db9df9d..db9df9d 100644
--- a/test cases/unit/94 custominc/prog.c
+++ b/test cases/unit/95 custominc/prog.c
diff --git a/test cases/unit/94 custominc/prog2.c b/test cases/unit/95 custominc/prog2.c
index e64b229..e64b229 100644
--- a/test cases/unit/94 custominc/prog2.c
+++ b/test cases/unit/95 custominc/prog2.c
diff --git a/test cases/unit/95 implicit force fallback/meson.build b/test cases/unit/96 implicit force fallback/meson.build
index 623a338..623a338 100644
--- a/test cases/unit/95 implicit force fallback/meson.build
+++ b/test cases/unit/96 implicit force fallback/meson.build
diff --git a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build b/test cases/unit/96 implicit force fallback/subprojects/something/meson.build
index 89a4727..89a4727 100644
--- a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build
+++ b/test cases/unit/96 implicit force fallback/subprojects/something/meson.build
diff --git a/test cases/unit/96 compiler.links file arg/meson.build b/test cases/unit/97 compiler.links file arg/meson.build
index c409dcb..c409dcb 100644
--- a/test cases/unit/96 compiler.links file arg/meson.build
+++ b/test cases/unit/97 compiler.links file arg/meson.build
diff --git a/test cases/unit/96 compiler.links file arg/test.c b/test cases/unit/97 compiler.links file arg/test.c
index 78f2de1..78f2de1 100644
--- a/test cases/unit/96 compiler.links file arg/test.c
+++ b/test cases/unit/97 compiler.links file arg/test.c
diff --git a/test cases/unit/97 link full name/.gitignore b/test cases/unit/98 link full name/.gitignore
index 8129601..8129601 100644
--- a/test cases/unit/97 link full name/.gitignore
+++ b/test cases/unit/98 link full name/.gitignore
diff --git a/test cases/unit/97 link full name/libtestprovider/meson.build b/test cases/unit/98 link full name/libtestprovider/meson.build
index 128c213..128c213 100644
--- a/test cases/unit/97 link full name/libtestprovider/meson.build
+++ b/test cases/unit/98 link full name/libtestprovider/meson.build
diff --git a/test cases/unit/97 link full name/libtestprovider/provider.c b/test cases/unit/98 link full name/libtestprovider/provider.c
index 5e79966..5e79966 100644
--- a/test cases/unit/97 link full name/libtestprovider/provider.c
+++ b/test cases/unit/98 link full name/libtestprovider/provider.c
diff --git a/test cases/unit/97 link full name/proguser/meson.build b/test cases/unit/98 link full name/proguser/meson.build
index 5be5bc9..5be5bc9 100644
--- a/test cases/unit/97 link full name/proguser/meson.build
+++ b/test cases/unit/98 link full name/proguser/meson.build
diff --git a/test cases/unit/97 link full name/proguser/receiver.c b/test cases/unit/98 link full name/proguser/receiver.c
index d661ae4..d661ae4 100644
--- a/test cases/unit/97 link full name/proguser/receiver.c
+++ b/test cases/unit/98 link full name/proguser/receiver.c
diff --git a/test cases/unit/98 install all targets/bar-custom.txt b/test cases/unit/99 install all targets/bar-custom.txt
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/bar-custom.txt
+++ b/test cases/unit/99 install all targets/bar-custom.txt
diff --git a/test cases/unit/98 install all targets/bar-devel.h b/test cases/unit/99 install all targets/bar-devel.h
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/bar-devel.h
+++ b/test cases/unit/99 install all targets/bar-devel.h
diff --git a/test cases/unit/98 install all targets/bar-notag.txt b/test cases/unit/99 install all targets/bar-notag.txt
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/bar-notag.txt
+++ b/test cases/unit/99 install all targets/bar-notag.txt
diff --git a/test cases/unit/98 install all targets/custom_files/data.txt b/test cases/unit/99 install all targets/custom_files/data.txt
index 557db03..557db03 100644
--- a/test cases/unit/98 install all targets/custom_files/data.txt
+++ b/test cases/unit/99 install all targets/custom_files/data.txt
diff --git a/test cases/unit/98 install all targets/excludes/excluded.txt b/test cases/unit/99 install all targets/excludes/excluded.txt
index 59b0644..59b0644 100644
--- a/test cases/unit/98 install all targets/excludes/excluded.txt
+++ b/test cases/unit/99 install all targets/excludes/excluded.txt
diff --git a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt b/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt
index 3b94f91..3b94f91 100644
--- a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
+++ b/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt
diff --git a/test cases/unit/98 install all targets/excludes/installed.txt b/test cases/unit/99 install all targets/excludes/installed.txt
index 8437692..8437692 100644
--- a/test cases/unit/98 install all targets/excludes/installed.txt
+++ b/test cases/unit/99 install all targets/excludes/installed.txt
diff --git a/test cases/unit/98 install all targets/foo.in b/test cases/unit/99 install all targets/foo.in
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/foo.in
+++ b/test cases/unit/99 install all targets/foo.in
diff --git a/test cases/unit/98 install all targets/foo1-devel.h b/test cases/unit/99 install all targets/foo1-devel.h
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/foo1-devel.h
+++ b/test cases/unit/99 install all targets/foo1-devel.h
diff --git a/test cases/unit/98 install all targets/lib.c b/test cases/unit/99 install all targets/lib.c
index 2ea9c7d..2ea9c7d 100644
--- a/test cases/unit/98 install all targets/lib.c
+++ b/test cases/unit/99 install all targets/lib.c
diff --git a/test cases/unit/98 install all targets/main.c b/test cases/unit/99 install all targets/main.c
index 0fb4389..0fb4389 100644
--- a/test cases/unit/98 install all targets/main.c
+++ b/test cases/unit/99 install all targets/main.c
diff --git a/test cases/unit/98 install all targets/meson.build b/test cases/unit/99 install all targets/meson.build
index c5f33a0..c5f33a0 100644
--- a/test cases/unit/98 install all targets/meson.build
+++ b/test cases/unit/99 install all targets/meson.build
diff --git a/test cases/unit/98 install all targets/script.py b/test cases/unit/99 install all targets/script.py
index c5f3be9..c5f3be9 100644
--- a/test cases/unit/98 install all targets/script.py
+++ b/test cases/unit/99 install all targets/script.py
diff --git a/test cases/unit/98 install all targets/subdir/bar2-devel.h b/test cases/unit/99 install all targets/subdir/bar2-devel.h
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/subdir/bar2-devel.h
+++ b/test cases/unit/99 install all targets/subdir/bar2-devel.h
diff --git a/test cases/unit/98 install all targets/subdir/foo2.in b/test cases/unit/99 install all targets/subdir/foo2.in
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/subdir/foo2.in
+++ b/test cases/unit/99 install all targets/subdir/foo2.in
diff --git a/test cases/unit/98 install all targets/subdir/foo3-devel.h b/test cases/unit/99 install all targets/subdir/foo3-devel.h
index e69de29..e69de29 100644
--- a/test cases/unit/98 install all targets/subdir/foo3-devel.h
+++ b/test cases/unit/99 install all targets/subdir/foo3-devel.h
diff --git a/test cases/unit/98 install all targets/subdir/lib.c b/test cases/unit/99 install all targets/subdir/lib.c
index 2ea9c7d..2ea9c7d 100644
--- a/test cases/unit/98 install all targets/subdir/lib.c
+++ b/test cases/unit/99 install all targets/subdir/lib.c
diff --git a/test cases/unit/98 install all targets/subdir/main.c b/test cases/unit/99 install all targets/subdir/main.c
index 0fb4389..0fb4389 100644
--- a/test cases/unit/98 install all targets/subdir/main.c
+++ b/test cases/unit/99 install all targets/subdir/main.c
diff --git a/test cases/unit/98 install all targets/subdir/meson.build b/test cases/unit/99 install all targets/subdir/meson.build
index 53c796a..53c796a 100644
--- a/test cases/unit/98 install all targets/subdir/meson.build
+++ b/test cases/unit/99 install all targets/subdir/meson.build
diff --git a/test cases/unit/98 install all targets/subdir/script.py b/test cases/unit/99 install all targets/subdir/script.py
index c5f3be9..c5f3be9 100644
--- a/test cases/unit/98 install all targets/subdir/script.py
+++ b/test cases/unit/99 install all targets/subdir/script.py
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt b/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt
index 43d5a8e..43d5a8e 100644
--- a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
+++ b/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt b/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt
index ba62923..ba62923 100644
--- a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
+++ b/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/meson.build b/test cases/unit/99 install all targets/subprojects/subproject/meson.build
index ff474ac..ff474ac 100644
--- a/test cases/unit/98 install all targets/subprojects/subproject/meson.build
+++ b/test cases/unit/99 install all targets/subprojects/subproject/meson.build
diff --git a/test cases/vala/32 valaless vapigen/clib.c b/test cases/vala/32 valaless vapigen/clib.c
new file mode 100644
index 0000000..a55ecd4
--- /dev/null
+++ b/test cases/vala/32 valaless vapigen/clib.c
@@ -0,0 +1,5 @@
+#include "clib.h"
+
+int clib_fun(void) {
+    return 42;
+}
diff --git a/test cases/vala/32 valaless vapigen/clib.h b/test cases/vala/32 valaless vapigen/clib.h
new file mode 100644
index 0000000..4d855c9
--- /dev/null
+++ b/test cases/vala/32 valaless vapigen/clib.h
@@ -0,0 +1,3 @@
+#pragma once
+
+int clib_fun(void);
diff --git a/test cases/vala/32 valaless vapigen/meson.build b/test cases/vala/32 valaless vapigen/meson.build
new file mode 100644
index 0000000..22a99e5
--- /dev/null
+++ b/test cases/vala/32 valaless vapigen/meson.build
@@ -0,0 +1,34 @@
+project('valaless-vapigen', 'c')
+
+if host_machine.system() == 'cygwin'
+  error('MESON_SKIP_TEST Does not work with the Vala currently packaged in cygwin')
+endif
+
+gnome = import('gnome')
+
+clib_src = [
+  'clib.c',
+  'clib.h'
+]
+
+clib_lib = shared_library('clib', clib_src)
+
+clib_gir = gnome.generate_gir(clib_lib,
+  sources: clib_src,
+  namespace: 'Clib',
+  nsversion: '0',
+  header: 'clib.h',
+  symbol_prefix: 'clib'
+)
+
+clib_vapi = gnome.generate_vapi('clib', sources: clib_gir[0])
+
+clib_dep = declare_dependency(
+  include_directories: include_directories('.'),
+  link_with: clib_lib,
+  sources: clib_gir,
+  dependencies: clib_vapi
+)
+
+
+test('clib-test', executable('clib-test', 'test_clib.c', dependencies: clib_dep))
diff --git a/test cases/vala/32 valaless vapigen/test_clib.c b/test cases/vala/32 valaless vapigen/test_clib.c
new file mode 100644
index 0000000..6fd426c
--- /dev/null
+++ b/test cases/vala/32 valaless vapigen/test_clib.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+#include <clib.h>
+
+int main(void) {
+    if (clib_fun () == 42)
+        return EXIT_SUCCESS;
+    else
+        return EXIT_FAILURE;
+}