Makefile and code fixes to build the unit tests

7 files changed, 43 insertions, 14 deletions

diff --git a/unit_tests/Makefile b/unit_tests/Makefile
new file mode 100644
index 0000000..9cc192b
--- /dev/null
+++ b/unit_tests/Makefile
@@ -0,0 +1,31 @@
+#
+# Lanes/unit_tests/Makefile
+#
+
+include ../Shared.mk
+
+SRC=$(wildcard *.cpp) ../src/deep.cpp ../src/compat.cpp
+
+OBJ=$(SRC:.cpp=.o)
+
+
+_UNITTEST_TARGET=UnitTests$(_LUAEXT)
+
+#---
+all: $(_UNITTEST_TARGET)
+
+_pch.hpp.gch: _pch.hpp
+        $(CC) -I "../.." $(CFLAGS) -x c++-header _pch.hpp -o _pch.hpp.gch
+
+%.o: %.cpp _pch.hpp.gch *.h *.hpp Makefile
+        $(CC) -I "../.." $(CFLAGS) -c $<
+
+# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
+#
+$(_UNITTEST_TARGET): $(OBJ)
+        $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
+
+clean:
+        -rm -rf $(_UNITTEST_TARGET) *.o *.map
+
+.PROXY: all clean
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj
index 5cc3b2f..7cdbafe 100644
--- a/unit_tests/UnitTests.vcxproj
+++ b/unit_tests/UnitTests.vcxproj
@@ -345,6 +345,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Catch2.runsettings" />
+    <None Include="Makefile" />
     <None Include="scripts\coro\basics.lua" />
     <None Include="scripts\coro\error_handling.lua" />
     <None Include="scripts\lane\cooperative_shutdown.lua" />
diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters
index 45ae229..c4e85c5 100644
--- a/unit_tests/UnitTests.vcxproj.filters
+++ b/unit_tests/UnitTests.vcxproj.filters
@@ -51,6 +51,9 @@
     <Filter Include="Catch2">
       <UniqueIdentifier>{2e1bf85c-7722-42ba-86f8-ac0f5a494ac5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Make">
+      <UniqueIdentifier>{c62af5d9-9161-4ca1-9b58-6837e2907e35}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="scripts\linda\send_receive.lua">
@@ -107,5 +110,8 @@
     <None Include="Catch2.runsettings">
       <Filter>Catch2</Filter>
     </None>
+    <None Include="Makefile">
+      <Filter>Make</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/unit_tests/_pch.hpp b/unit_tests/_pch.hpp
index 7fa18a2..1e98c5a 100644
--- a/unit_tests/_pch.hpp
+++ b/unit_tests/_pch.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
+#include <atomic>
 #include <cassert>
 #include <filesystem>
 #include <source_location>
 #include <mutex>
+#include <thread>
 #include <variant>
 
 #include "catch_amalgamated.hpp"
diff --git a/unit_tests/embedded_tests.cpp b/unit_tests/embedded_tests.cpp
index bf2dd6e..1a63721 100644
--- a/unit_tests/embedded_tests.cpp
+++ b/unit_tests/embedded_tests.cpp
@@ -60,14 +60,6 @@ TEST_CASE("lanes.embedding")
     lua_pop(S, 1);
     S.stackCheck(0);
 
-    auto load_lanes_lua = +[](lua_State* const L_) {
-        if (0 == luaL_dofile(L_, "lanes.lua")) {
-            return 1;
-        } else {
-            return 0;
-        }
-    };
-
     _p_luaopen_lanes_embedded(S, local::load_lanes_lua);                                           // S: lanes
     lua_pop(S, 1);
     S.stackCheck(0);
diff --git a/unit_tests/init_and_shutdown.cpp b/unit_tests/init_and_shutdown.cpp
index 78c472f..147a742 100644
--- a/unit_tests/init_and_shutdown.cpp
+++ b/unit_tests/init_and_shutdown.cpp
@@ -756,11 +756,6 @@ TEST_CASE("lanes.on_state_create setting")
     LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
 
     local::OnStateCreateCallsCount.store(0, std::memory_order_relaxed);
-    auto on_state_create = +[](lua_State* const L_) {
-        local::OnStateCreateCallsCount.fetch_add(1, std::memory_order_relaxed);
-        return 0;
-    };
-
 
     SECTION("on_state_create called in Keeper states")
     {
diff --git a/unit_tests/shared.cpp b/unit_tests/shared.cpp
index 73aeadd..023e917 100644
--- a/unit_tests/shared.cpp
+++ b/unit_tests/shared.cpp
@@ -101,7 +101,9 @@ namespace
 TEST_CASE("lanes.stack checker")
 {
     LuaState _L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+#if HAVE_LUA_ASSERT()
     StackChecker::CallsCassert = false;
+#endif // HAVE_LUA_ASSERT()
 
     auto _doStackCheckerTest = [&_L](lua_CFunction const _f, LuaError const _expected) {
         lua_pushcfunction(_L, _f);
@@ -223,7 +225,7 @@ std::string_view LuaState::doStringAndRet(std::string_view const& str_) const
         STACK_CHECK(L, 1); // the error message is on the stack
         return "";
     }
-    LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                                              // L: "<msg>"?|retstring
+    [[maybe_unused]] LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                             // L: "<msg>"?|retstring
     STACK_CHECK(L, 1);
     return luaG_tostring(L, kIdxTop);
 }