diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml index ab43296c358..c25081ef0a5 100644 --- a/.github/workflows/linux_arm64.yml +++ b/.github/workflows/linux_arm64.yml @@ -30,8 +30,6 @@ jobs: - name: Tests run: | - gcc --version - xmake l os.arch xmake lua -v -D tests/run.lua xrepo --version diff --git a/tests/test_utils/test_build.lua b/tests/test_utils/test_build.lua index 002c46e1abf..8a2b75ce9d9 100644 --- a/tests/test_utils/test_build.lua +++ b/tests/test_utils/test_build.lua @@ -4,7 +4,8 @@ function test_build:build(argv) os.exec("xmake f -c -D -y") os.exec("xmake") os.rm("build") - os.exec("xmake f -c -D -y --policies=compatibility.version=3.0") + --os.exec("xmake f -c -D -y --policies=compatibility.version:3.0") + os.exec("xmake f -c -D -y --policies=compatibility.version=3.0") -- FIXME os.exec("xmake -r") end diff --git a/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua index fb375fcb7a4..06b522ce8a6 100644 --- a/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua +++ b/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua @@ -56,7 +56,7 @@ function generate_dependency_for(target, sourcefile, opt) print(os.args(table.join(clangscandeps, dependency_flags))) end local outdata, errdata = os.iorunv(clangscandeps, dependency_flags) - assert(errdata, errdata) + assert(outdata, errdata) io.writefile(jsonfile, outdata) else