Makefile and code fixes to build the unit tests

11 files changed, 184 insertions, 140 deletions

diff --git a/Makefile b/Makefile
index d7c4d6f..25dc38d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,14 +37,19 @@ LUA=$(word 1,$(shell which lua5.1$(_LUAEXT)) $(shell which lua51$(_LUAEXT)) $(sh
 
 _TARGET_SO=$(_TARGET_DIR)/core.$(_SO)
 
+_UNITTEST_TARGET=$(_TARGET_DIR)/UnitTests$(_LUAEXT)
+
 _PREFIX=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua"
 
 #---
-all: $(_TARGET_SO)
+all: $(_TARGET_SO) $(_UNITTEST_TARGET)
 
 $(_TARGET_SO): src/*.lua src/*.cpp src/*.h src/*.hpp
         cd src && $(MAKE) LUA=$(LUA)
 
+$(_UNITTEST_TARGET): $(_TARGET_SO)
+        cd unit_tests && $(MAKE)
+
 clean:
         cd src && $(MAKE) clean
 
@@ -271,7 +276,7 @@ endif
 # 2.0.1: Running this (instant exit of the main Lua state) occasionally
 #        segfaults (1:15 or so on OS X PowerPC G4).
 #
-require: $(_TARGET_SO)
+require_module: $(_TARGET_SO)
         $(_PREFIX) $(LUA) -e "require '$(MODULE)'"
 
 run: $(_TARGET_SO)
diff --git a/Shared.mk b/Shared.mk
new file mode 100644
index 0000000..56c951c
--- /dev/null
+++ b/Shared.mk
@@ -0,0 +1,114 @@
+CC= g++ -std=c++20
+
+# LuaRocks gives 'LIBFLAG' from the outside
+#
+LIBFLAG=-shared
+
+OPT_FLAGS=-O2
+#         -O0 -g
+
+ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
+  # MinGW MSYS on Windows
+  #
+  _SO=dll
+  _LUAEXT=.exe
+  TIME=timeit.exe
+else
+  _SO=so
+  _LUAEXT=
+endif
+
+ifeq "$(LUAROCKS)" ""
+  ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
+    # MinGW MSYS on Windows
+    #
+    # - 'lua' and 'luac' expected to be on the path
+    # - %LUA_DEV% must lead to include files and libraries (Lua for Windows >= 5.1.3.14)
+    # - %MSCVR80% must be the full pathname of 'msvcr80.dll'
+    #
+    ifeq "$(LUA_DEV)" ""
+      $(warning LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1')
+      # this assumes Lua was built and installed from source and everything is located in default folders (/usr/local/include and /usr/local/bin)
+      LUA_FLAGS:=-I "/usr/local/include"
+      LUA_LIBS:=$(word 1,$(shell which lua54.$(_SO)) $(shell which lua53.$(_SO)) $(shell which lua52.$(_SO)) $(shell which lua51$(_SO)))
+    else
+      LUA_FLAGS:=-I "$(LUA_DEV)/include"
+      LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
+    endif
+    LIBFLAG=-shared -Wl,-Map,lanes.map
+  else
+    # Autodetect LUA_FLAGS and/or LUA_LIBS
+    #
+    ifneq "$(shell which pkg-config)" ""
+      ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
+        LUA_FLAGS:=$(shell pkg-config --cflags luajit)
+        LUA_LIBS:=$(shell pkg-config --libs luajit)
+          #
+          # Debian: -I/usr/include/luajit-2.0
+          #         -lluajit-5.1
+      else
+        ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
+          LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
+          LUA_LIBS:=$(shell pkg-config --libs lua5.1)
+            #
+            # Ubuntu: -I/usr/include/lua5.1 
+            #         -llua5.1
+        else
+          ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
+            LUA_FLAGS:=$(shell pkg-config --cflags lua)
+            LUA_LIBS:=$(shell pkg-config --libs lua)
+              #
+              # OS X fink with pkg-config:
+              #      -I/sw/include 
+              #      -L/sw/lib -llua -lm
+          else
+            $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!)
+            LUA_FLAGS:=
+            LUA_LIBS:=-llua
+          endif
+        endif
+      endif
+    else
+      # No 'pkg-config'; try defaults
+      #
+      ifeq "$(shell uname -s)" "Darwin"
+        $(warning *** Assuming 'fink' at default path)
+        LUA_FLAGS:=-I/sw/include
+        LUA_LIBS:=-L/sw/lib -llua
+      else
+        $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config')
+        LUA_FLAGS:=
+        LUA_LIBS:=-llua
+      endif
+    endif
+  endif
+
+  ifeq "$(shell uname -s)" "Darwin"
+    # Some machines need 'MACOSX_DEPLOYMENT_TARGET=10.3' for using '-undefined dynamic_lookup'
+    # (at least PowerPC running 10.4.11); does not harm the others
+    #
+    CC = MACOSX_DEPLOYMENT_TARGET=10.3 gcc
+    LIBFLAG = -bundle -undefined dynamic_lookup
+  endif
+  
+  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
+  LIBS=$(LUA_LIBS)
+endif
+
+#---
+# PThread platform specifics
+#
+ifeq "$(shell uname -s)" "Linux"
+  # -D_GNU_SOURCE needed for 'pthread_mutexattr_settype'
+  CFLAGS += -D_GNU_SOURCE -fPIC
+
+  # Use of -DUSE_PTHREAD_TIMEDJOIN is possible, but not recommended (slower & keeps threads
+  # unreleased somewhat longer)
+  #CFLAGS += -DUSE_PTHREAD_TIMEDJOIN
+
+  LIBS += -lpthread
+endif
+
+ifeq "$(shell uname -s)" "BSD"
+  LIBS += -lpthread
+endif
diff --git a/deep_test/deep_test.cpp b/deep_test/deep_test.cpp
index 46f99d9..cbc33ca 100644
--- a/deep_test/deep_test.cpp
+++ b/deep_test/deep_test.cpp
@@ -204,44 +204,44 @@ static int clonable_get(lua_State* const L_)
 // #################################################################################################
 
 [[nodiscard]]
-static int clonable_set(lua_State* L)
+static int clonable_set(lua_State* const L_)
 {
-    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-    lua_Integer i = lua_tointeger(L, 2);
-    self->val = i;
+    MyClonableUserdata* _self = static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1));
+    lua_Integer i = lua_tointeger(L_, 2);
+    _self->val = i;
     return 0;
 }
 
 // #################################################################################################
 
 [[nodiscard]]
-static int clonable_setuv(lua_State* L)
+static int clonable_setuv(lua_State* const L_)
 {
-    MyClonableUserdata* const _self{ static_cast<MyClonableUserdata*>(lua_touserdata(L, 1)) };
-    UserValueIndex const _uv{ static_cast<UserValueIndex::type>(luaL_optinteger(L, 2, 1)) };
-    lua_settop(L, 3);
-    lua_pushboolean(L, lua_setiuservalue(L, StackIndex{ 1 }, _uv) != 0);
+    [[maybe_unused]] MyClonableUserdata* const _self{ static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1)) };
+    UserValueIndex const _uv{ static_cast<UserValueIndex::type>(luaL_optinteger(L_, 2, 1)) };
+    lua_settop(L_, 3);
+    lua_pushboolean(L_, lua_setiuservalue(L_, StackIndex{ 1 }, _uv) != 0);
     return 1;
 }
 
 // #################################################################################################
 
 [[nodiscard]]
-static int clonable_getuv(lua_State* L)
+static int clonable_getuv(lua_State* const L_)
 {
-    MyClonableUserdata* const _self{ static_cast<MyClonableUserdata*>(lua_touserdata(L, 1)) };
-    UserValueIndex const _uv{ static_cast<UserValueIndex::type>(luaL_optinteger(L, 2, 1)) };
-    lua_getiuservalue(L, StackIndex{ 1 }, _uv);
+    [[maybe_unused]] MyClonableUserdata* const _self{ static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1)) };
+    UserValueIndex const _uv{ static_cast<UserValueIndex::type>(luaL_optinteger(L_, 2, 1)) };
+    lua_getiuservalue(L_, StackIndex{ 1 }, _uv);
     return 1;
 }
 
 // #################################################################################################
 
 [[nodiscard]]
-static int clonable_tostring(lua_State* L)
+static int clonable_tostring(lua_State* const L_)
 {
-    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
-    luaG_pushstring(L, "%p:clonable(%d)", lua_topointer(L, 1), self->val);
+    MyClonableUserdata* _self = static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1));
+    luaG_pushstring(L_, "%p:clonable(%d)", lua_topointer(L_, 1), _self->val);
     return 1;
 }
 
@@ -250,7 +250,7 @@ static int clonable_tostring(lua_State* L)
 [[nodiscard]]
 static int clonable_gc(lua_State* const L_)
 {
-    MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1));
+    [[maybe_unused]] MyClonableUserdata* _self = static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1));
     if (lua_getiuservalue(L_, kIdxTop, UserValueIndex{ 1 }) == LUA_TFUNCTION) {
         lua_call(L_, 0, 0);
     }
diff --git a/src/Makefile b/src/Makefile
index f2e2eb5..262f970 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,120 +5,16 @@
 #   make LUAROCKS=1 CFLAGS=... LIBFLAG=...  LuaRocks automated build
 #
 
+include ../Shared.mk
+
 MODULE=lanes
 
 CC= g++ -std=c++20
 
-SRC=_pch.cpp allocator.cpp cancel.cpp compat.cpp deep.cpp intercopycontext.cpp keeper.cpp lane.cpp lanes.cpp linda.cpp lindafactory.cpp nameof.cpp state.cpp threading.cpp tools.cpp tracker.cpp universe.cpp
+SRC=$(wildcard *.cpp)
 
 OBJ=$(SRC:.cpp=.o)
 
-# LuaRocks gives 'LIBFLAG' from the outside
-#
-LIBFLAG=-shared
-
-OPT_FLAGS=-O2
-#         -O0 -g
-
-_SO=so
-ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
-  _SO=dll
-endif
-
-ifeq "$(LUAROCKS)" ""
-  ifeq "$(findstring MINGW,$(shell uname -s))" "MINGW"
-    # MinGW MSYS on Windows
-    #
-    # - 'lua' and 'luac' expected to be on the path
-    # - %LUA_DEV% must lead to include files and libraries (Lua for Windows >= 5.1.3.14)
-    # - %MSCVR80% must be the full pathname of 'msvcr80.dll'
-    #
-    ifeq "$(LUA_DEV)" ""
-      $(warning LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1')
-      # this assumes Lua was built and installed from source and everything is located in default folders (/usr/local/include and /usr/local/bin)
-      LUA_FLAGS:=-I "/usr/local/include"
-      LUA_LIBS:=$(word 1,$(shell which lua54.$(_SO)) $(shell which lua53.$(_SO)) $(shell which lua52.$(_SO)) $(shell which lua51$(_SO)))
-    else
-      LUA_FLAGS:=-I "$(LUA_DEV)/include"
-      LUA_LIBS:="$(LUA_DEV)/lua5.1.dll" -lgcc
-    endif
-    LIBFLAG=-shared -Wl,-Map,lanes.map
-  else
-    # Autodetect LUA_FLAGS and/or LUA_LIBS
-    #
-    ifneq "$(shell which pkg-config)" ""
-      ifeq "$(shell pkg-config --exists luajit && echo 1)" "1"
-        LUA_FLAGS:=$(shell pkg-config --cflags luajit)
-        LUA_LIBS:=$(shell pkg-config --libs luajit)
-          #
-          # Debian: -I/usr/include/luajit-2.0
-          #         -lluajit-5.1
-      else
-        ifeq "$(shell pkg-config --exists lua5.1 && echo 1)" "1"
-          LUA_FLAGS:=$(shell pkg-config --cflags lua5.1)
-          LUA_LIBS:=$(shell pkg-config --libs lua5.1)
-            #
-            # Ubuntu: -I/usr/include/lua5.1 
-            #         -llua5.1
-        else
-          ifeq "$(shell pkg-config --exists lua && echo 1)" "1"
-            LUA_FLAGS:=$(shell pkg-config --cflags lua)
-            LUA_LIBS:=$(shell pkg-config --libs lua)
-              #
-              # OS X fink with pkg-config:
-              #      -I/sw/include 
-              #      -L/sw/lib -llua -lm
-          else
-            $(warning *** 'pkg-config' existed but did not know of 'lua[5.1]' - Good luck!)
-            LUA_FLAGS:=
-            LUA_LIBS:=-llua
-          endif
-        endif
-      endif
-    else
-      # No 'pkg-config'; try defaults
-      #
-      ifeq "$(shell uname -s)" "Darwin"
-        $(warning *** Assuming 'fink' at default path)
-        LUA_FLAGS:=-I/sw/include
-        LUA_LIBS:=-L/sw/lib -llua
-      else
-        $(warning *** Assuming an arbitrary Lua installation; try installing 'pkg-config')
-        LUA_FLAGS:=
-        LUA_LIBS:=-llua
-      endif
-    endif
-  endif
-
-  ifeq "$(shell uname -s)" "Darwin"
-    # Some machines need 'MACOSX_DEPLOYMENT_TARGET=10.3' for using '-undefined dynamic_lookup'
-    # (at least PowerPC running 10.4.11); does not harm the others
-    #
-    CC = MACOSX_DEPLOYMENT_TARGET=10.3 gcc
-    LIBFLAG = -bundle -undefined dynamic_lookup
-  endif
-  
-  CFLAGS=-Wall -Werror $(OPT_FLAGS) $(LUA_FLAGS)
-  LIBS=$(LUA_LIBS)
-endif
-
-#---
-# PThread platform specifics
-#
-ifeq "$(shell uname -s)" "Linux"
-  # -D_GNU_SOURCE needed for 'pthread_mutexattr_settype'
-  CFLAGS += -D_GNU_SOURCE -fPIC
-
-  # Use of -DUSE_PTHREAD_TIMEDJOIN is possible, but not recommended (slower & keeps threads
-  # unreleased somewhat longer)
-  #CFLAGS += -DUSE_PTHREAD_TIMEDJOIN
-
-  LIBS += -lpthread
-endif
-
-ifeq "$(shell uname -s)" "BSD"
-  LIBS += -lpthread
-endif
 
 MODULE_DIR=$(MODULE)
 
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);
 }