diff --git a/.github/workflows/nix_ci.yml b/.github/workflows/nix_ci.yml index 905c85b..fd6b9f0 100644 --- a/.github/workflows/nix_ci.yml +++ b/.github/workflows/nix_ci.yml @@ -29,7 +29,7 @@ jobs: pip install hererocks hererocks lua-pkg --${{ matrix.lua }} -rlatest - - name: Install lanes + - name: Install lanes and multi run: | source ${{github.workspace}}/lua-pkg/bin/activate luarocks install lanes diff --git a/rockspecs/multi-16.0-0.rockspec b/rockspecs/multi-16.0-0.rockspec index 5e50994..818d8b7 100644 --- a/rockspecs/multi-16.0-0.rockspec +++ b/rockspecs/multi-16.0-0.rockspec @@ -35,6 +35,7 @@ build = { ["multi.integration.pseudoManager.threads"] = "integration/pseudoManager/threads.lua", ["multi.integration.luvitManager"] = "integration/luvitManager.lua", ["multi.integration.threading"] = "integration/threading.lua", + ["multi.integration.sharedExtension"] = "integration/sharedExtension/init.lua", --["multi.integration.networkManager"] = "integration/networkManager.lua", } } \ No newline at end of file diff --git a/tests/runtests.lua b/tests/runtests.lua index db7eb4e..c5b7c13 100644 --- a/tests/runtests.lua +++ b/tests/runtests.lua @@ -156,13 +156,20 @@ runTest = thread:newFunction(function() if not love then local ec = 0 multi.print("Testing pseudo threading") - _, str, ecc = os.execute("lua tests/threadtests.lua p") - ec = ec + ecc - multi.print("Testing lanes threading") - _, str, ecc = os.execute("lua tests/threadtests.lua l") - ec = ec + ecc - if ec ~= 0 then + capture = io.popen("lua tests/threadtests.lua p"):read("*a") + if capture:lower():match("error") then + ec = ec + 1 os.exit(1) + else + io.write(capture) + end + multi.print("Testing lanes threading") + capture = io.popen("lua tests/threadtests.lua l"):read("*a") + if capture:lower():match("error") then + ec = ec + 1 + os.exit(1) + else + io.write(capture) end os.exit(0) end diff --git a/tests/threadtests.lua b/tests/threadtests.lua index 6a21cbc..05dc643 100644 --- a/tests/threadtests.lua +++ b/tests/threadtests.lua @@ -210,7 +210,7 @@ multi:newThread("Scheduler Thread",function() end) multi.OnExit(function(err_or_errorcode) - multi.print("Error Code: ", err_or_errorcode) + multi.print("EC: ", err_or_errorcode) if not we_good then multi.print("There was an error running some tests!") return