From 2b9f732d88ebf3b1754ecaa136f55f1a7783d1ae Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Sun, 26 Nov 2023 13:10:16 -0500 Subject: [PATCH] Working on paths --- .github/workflows/nix_ci.yml | 2 +- tests/runtests.lua | 30 +++++++++--------------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/nix_ci.yml b/.github/workflows/nix_ci.yml index 386cd50..34a6c6b 100644 --- a/.github/workflows/nix_ci.yml +++ b/.github/workflows/nix_ci.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: '3.10' - name: Setup env run: | diff --git a/tests/runtests.lua b/tests/runtests.lua index 363c418..34ed212 100644 --- a/tests/runtests.lua +++ b/tests/runtests.lua @@ -155,28 +155,16 @@ runTest = thread:newFunction(function() end if not love then local ec = 0 - if _VERSION == "Lua 5.1" then - 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 - os.exit(1) - end - os.exit(0) - else - multi.print("Testing pseudo threading") - ec = ec + os.execute("lua tests/threadtests.lua p") - multi.print("Testing lanes threading") - ec = ec + os.execute("lua tests/threadtests.lua l") - multi:Stop() - if ec ~= 0 then - os.exit(1) - end - os.exit(0) + multi.print("Testing pseudo threading") + _, str, ecc = os.execute("lua multi/tests/threadtests.lua p") + ec = ec + ecc + multi.print("Testing lanes threading") + _, str, ecc = os.execute("lua multi/tests/threadtests.lua l") + ec = ec + ecc + if ec ~= 0 then + os.exit(1) end + os.exit(0) end end)