summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-01-20 23:53:11 +0800
committerruki <[email protected]>2025-01-20 23:53:11 +0800
commit22346776a83fda03c2b1e5054d049ff352dac0fd (patch)
treed09f7b362169fb65b0765a62d995392cda10c3f0
parente055bc97774bd868e5dcdec80d1de4b4570d4120 (diff)
do some tests
-rw-r--r--.github/workflows/linux_arm64.yml2
-rw-r--r--tests/test_utils/test_build.lua3
-rw-r--r--xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua2
3 files changed, 3 insertions, 4 deletions
diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
index ab43296c3..c25081ef0 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 002c46e1a..8a2b75ce9 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 fb375fcb7..06b522ce8 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