8 files changed, 73 insertions, 20 deletions
diff --git a/test/functional/fixtures/CMakeLists.txt b/test/functional/fixtures/CMakeLists.txt
index a5410c2f8c..6e64b1e4dc 100644
--- a/test/functional/fixtures/CMakeLists.txt
+++ b/test/functional/fixtures/CMakeLists.txt
@@ -1,14 +1,23 @@
-add_executable(tty-test EXCLUDE_FROM_ALL tty-test.c)
-target_link_libraries(tty-test ${LIBUV_LIBRARIES})
+add_library(test_lib INTERFACE)
+if(MINGW)
+  target_link_libraries(test_lib INTERFACE -municode)
+endif()
+if(WIN32)
+  target_compile_definitions(test_lib INTERFACE MSWIN)
+endif()
+target_link_libraries(test_lib INTERFACE nvim)
 
+add_executable(tty-test EXCLUDE_FROM_ALL tty-test.c)
 add_executable(shell-test EXCLUDE_FROM_ALL shell-test.c)
 # Fake pwsh (powershell) for testing make_filter_cmd(). #16271
 add_executable(pwsh-test EXCLUDE_FROM_ALL shell-test.c)
 add_executable(printargs-test EXCLUDE_FROM_ALL printargs-test.c)
 add_executable(printenv-test EXCLUDE_FROM_ALL printenv-test.c)
-if(MINGW)
-  set_target_properties(printenv-test PROPERTIES LINK_FLAGS -municode)
-endif()
-
 add_executable(streams-test EXCLUDE_FROM_ALL streams-test.c)
-target_link_libraries(streams-test ${LIBUV_LIBRARIES})
+
+target_link_libraries(tty-test PRIVATE test_lib)
+target_link_libraries(shell-test PRIVATE test_lib)
+target_link_libraries(pwsh-test PRIVATE test_lib)
+target_link_libraries(printargs-test PRIVATE test_lib)
+target_link_libraries(printenv-test PRIVATE test_lib)
+target_link_libraries(streams-test PRIVATE test_lib)
diff --git a/test/functional/fixtures/api_level_10.mpack b/test/functional/fixtures/api_level_10.mpack
new file mode 100644
index 0000000000..2a1f51045d
--- /dev/null
+++ b/test/functional/fixtures/api_level_10.mpack
diff --git a/test/functional/fixtures/filename_with_unicode_ααα b/test/functional/fixtures/filename_with_unicode_ααα
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/functional/fixtures/filename_with_unicode_ααα
diff --git a/test/functional/fixtures/printenv-test.c b/test/functional/fixtures/printenv-test.c
index 0e68129543..295b4f04c3 100644
--- a/test/functional/fixtures/printenv-test.c
+++ b/test/functional/fixtures/printenv-test.c
@@ -3,13 +3,13 @@
 
 #include <stdio.h>
 
-#ifdef WIN32
+#ifdef MSWIN
 # include <windows.h>
 #else
 # include <stdlib.h>
 #endif
 
-#ifdef WIN32
+#ifdef MSWIN
 int wmain(int argc, wchar_t **argv)
 #else
 int main(int argc, char **argv)
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
     return 1;
   }
 
-#ifdef WIN32
+#ifdef MSWIN
   wchar_t *value = _wgetenv(argv[1]);
   if (value == NULL) {
     return 1;
diff --git a/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua b/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
index a312572c5b..45226ce24b 100644
--- a/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
+++ b/test/functional/fixtures/start/nvim-leftpad/lua/async_leftpad.lua
@@ -1,3 +1,5 @@
 return function (val, res)
-  vim.loop.new_async(function() _G[res] = require'leftpad'(val) end):send()
+  local handle
+  handle = vim.loop.new_async(function() _G[res] = require'leftpad'(val) handle:close() end)
+  handle:send()
 end
diff --git a/test/functional/fixtures/startup-fail.lua b/test/functional/fixtures/startup-fail.lua
new file mode 100644
index 0000000000..adcfe2a201
--- /dev/null
+++ b/test/functional/fixtures/startup-fail.lua
@@ -0,0 +1,7 @@
+-- Test "nvim -l foo.lua …" with a Lua error.
+
+local function main()
+  error('my pearls!!')
+end
+
+main()
diff --git a/test/functional/fixtures/startup.lua b/test/functional/fixtures/startup.lua
new file mode 100644
index 0000000000..d0e60309bd
--- /dev/null
+++ b/test/functional/fixtures/startup.lua
@@ -0,0 +1,35 @@
+-- Test "nvim -l foo.lua …"
+
+local function printbufs()
+  local bufs = ''
+  for _, v in ipairs(vim.api.nvim_list_bufs()) do
+    local b = vim.fn.bufname(v)
+    if b:len() > 0 then
+      bufs = ('%s %s'):format(bufs, b)
+    end
+  end
+  print(('bufs:%s'):format(bufs))
+end
+
+local function parseargs(args)
+  local exitcode = nil
+  for i = 1, #args do
+    if args[i] == '--exitcode' then
+      exitcode = tonumber(args[i + 1])
+    end
+  end
+  return exitcode
+end
+
+local function main()
+  printbufs()
+  print('nvim args:', #vim.v.argv)
+  print('lua args:', vim.inspect(_G.arg))
+
+  local exitcode = parseargs(_G.arg)
+  if type(exitcode) == 'number' then
+    os.exit(exitcode)
+  end
+end
+
+main()
diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c
index 4438b73a22..6ee7715021 100644
--- a/test/functional/fixtures/tty-test.c
+++ b/test/functional/fixtures/tty-test.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <uv.h>
-#ifdef _WIN32
+#ifdef MSWIN
 # include <windows.h>
 #else
 # include <unistd.h>
@@ -23,7 +23,7 @@ uv_tty_t tty_out;
 bool owns_tty(void);  // silence -Wmissing-prototypes
 bool owns_tty(void)
 {
-#ifdef _WIN32
+#ifdef MSWIN
   // XXX: We need to make proper detect owns tty
   // HWND consoleWnd = GetConsoleWindow();
   // DWORD dwProcessId;
@@ -38,14 +38,14 @@ bool owns_tty(void)
 static void walk_cb(uv_handle_t *handle, void *arg)
 {
   if (!uv_is_closing(handle)) {
-#ifdef WIN32
+#ifdef MSWIN
     uv_tty_set_mode(&tty, UV_TTY_MODE_NORMAL);
 #endif
     uv_close(handle, NULL);
   }
 }
 
-#ifndef WIN32
+#ifndef MSWIN
 static void sig_handler(int signum)
 {
   switch (signum) {
@@ -64,7 +64,7 @@ static void sig_handler(int signum)
 }
 #endif
 
-#ifdef WIN32
+#ifdef MSWIN
 static void sigwinch_cb(uv_signal_t *handle, int signum)
 {
   int width, height;
@@ -102,7 +102,7 @@ static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
   uv_write_t req;
   uv_buf_t b = {
     .base = buf->base,
-#ifdef WIN32
+#ifdef MSWIN
     .len = (ULONG)cnt
 #else
     .len = (size_t)cnt
@@ -171,7 +171,7 @@ int main(int argc, char **argv)
   uv_prepare_t prepare;
   uv_prepare_init(uv_default_loop(), &prepare);
   uv_prepare_start(&prepare, prepare_cb);
-#ifndef WIN32
+#ifndef MSWIN
   uv_tty_init(uv_default_loop(), &tty, fileno(stderr), 1);
 #else
   uv_tty_init(uv_default_loop(), &tty, fileno(stdin), 1);
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
   uv_tty_set_mode(&tty, UV_TTY_MODE_RAW);
   tty.data = &interrupted;
   uv_read_start(STRUCT_CAST(uv_stream_t, &tty), alloc_cb, read_cb);
-#ifndef WIN32
+#ifndef MSWIN
   struct sigaction sa;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
 #endif
   uv_run(uv_default_loop(), UV_RUN_DEFAULT);
 
-#ifndef WIN32
+#ifndef MSWIN
   // XXX: Without this the SIGHUP handler is skipped on some systems.
   sleep(100);
 #endif