diff --git a/.github/workflows/ci-xmake-windows.yml b/.github/workflows/ci-xmake-windows.yml index 333ce111c..659f8d5d9 100644 --- a/.github/workflows/ci-xmake-windows.yml +++ b/.github/workflows/ci-xmake-windows.yml @@ -34,7 +34,7 @@ jobs: steps: - uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: v2.9.2 + xmake-version: v2.8.8 - name: update repo run: xmake repo -u - name: git crlf diff --git a/xmake.lua b/xmake.lua index 2b16d4bd6..572e11a04 100644 --- a/xmake.lua +++ b/xmake.lua @@ -341,9 +341,9 @@ if has_config("enable_tests") then set_values("wasm.preloadfiles", {"xmake.lua", "tests", "LICENSE"}) on_test(function (target, opt) node = os.getenv("EMSDK_NODE") - os.cd("$(buildir)/wasm/wasm32/$(mode)/") - print("> cd $(buildir)/wasm/wasm32/$(mode)/") - cmd = node .. " " .. opt.name .. ".js" + os.cd(target:targetdir()) + print("> cd " .. target:targetdir()) + cmd = node .. " " .. target:targetfile() print("> " .. cmd) local retval = try { function ()