wip v2

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update --quiet || true
-          sudo apt-get -yq --no-install-suggests --no-install-recommends install cmake liblua${{ matrix.lua }}-dev
+          sudo apt-get -yq --no-install-suggests --no-install-recommends install cmake liblua${{ matrix.lua }}-dev lua${{ matrix.lua }}
       - name: install system packages (macOS)
         if: runner.os == 'macOS'
         run: |

lib/CMakeLists.txt

@@ -7,6 +7,9 @@ file(GLOB lua_SOURCES
 	"${CMAKE_CURRENT_SOURCE_DIR}/*.lua"
 	"${CMAKE_CURRENT_SOURCE_DIR}/porch/*.lua")
 
+add_custom_target(libs
+	DEPENDS core)
+
 add_custom_target(lint
 	COMMAND echo LINTING FOR LUA 5.3
 	COMMAND luacheck --std=lua53 ${lua_SOURCES}

tests/CMakeLists.txt

@@ -1,4 +1,13 @@
-add_custom_target(check
-	COMMAND true # env PORCHBIN="${CMAKE_BINARY_DIR}/src/porch" PORCHLUA_PATH="${CMAKE_SOURCE_DIR}/lib" sh "${CMAKE_CURRENT_SOURCE_DIR}/basic_test.sh"
-	COMMAND env PORCHLIB_PATH="${CMAKE_BINARY_DIR}/lib" PORCHLUA_PATH="${CMAKE_SOURCE_DIR}/lib" sh "${CMAKE_CURRENT_SOURCE_DIR}/lua_test.sh"
+add_custom_target(check-install
+	COMMAND "${CMAKE_COMMAND}" --build . --target install)
+
+add_custom_target(check-cli
+	COMMAND env PORCHBIN="${CMAKE_BINARY_DIR}/src/porch" PORCHLUA_PATH="${CMAKE_SOURCE_DIR}/lib" sh "${CMAKE_CURRENT_SOURCE_DIR}/basic_test.sh"
+	DEPENDS porch)
+
+add_custom_target(check-lib
+	COMMAND env PORCHLIB_PATH="${CMAKE_BINARY_DIR}/lib" PORCHLUA_PATH="${CMAKE_SOURCE_DIR}/lib" LUA_VERSION_MAJOR="${LUA_VERSION_MAJOR}" LUA_VERSION_MINOR="${LUA_VERSION_MINOR}" sh "${CMAKE_CURRENT_SOURCE_DIR}/lua_test.sh"
+	DEPENDS libs check-install
 	WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
+add_custom_target(check DEPENDS check-cli check-lib)

tests/lua_test.sh

@@ -1,5 +1,20 @@
 #!/bin/sh
 
+schemes="lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}"
+schemes="$schemes lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}"
+
+for bin in $schemes; do
+	if command -v $bin >/dev/null; then
+		LUA="$bin"
+		break
+	fi
+done
+
+if [ -z "$LUA" ]; then
+	1>&2 "Could not find suitable binary named any of: $schemes"
+	exit 1
+fi
+
 for x in test_*.lua; do	#XXX WRONG
-	lua54 "$x"	#XXX WRONG
+	command $LUA "$x"
 done

tests/test_basic.lua

@@ -1,5 +1,3 @@
-local ltest = require('./libtest')
-
 local porch = require('porch')
 
-
+print(porch)