Skip to content

Commit fc81840

Browse files
committed
do some tests
1 parent e055bc9 commit fc81840

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/linux_arm64.yml

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ jobs:
3030
3131
- name: Tests
3232
run: |
33-
gcc --version
34-
xmake l os.arch
3533
xmake lua -v -D tests/run.lua
3634
xrepo --version
3735

tests/test_utils/test_build.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ function test_build:build(argv)
44
os.exec("xmake f -c -D -y")
55
os.exec("xmake")
66
os.rm("build")
7-
os.exec("xmake f -c -D -y --policies=compatibility.version=3.0")
7+
--os.exec("xmake f -c -D -y --policies=compatibility.version:3.0")
8+
os.exec("xmake f -c -D -y --policies=compatibility.version=3.0") -- FIXME
89
os.exec("xmake -r")
910
end
1011

xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function generate_dependency_for(target, sourcefile, opt)
5656
print(os.args(table.join(clangscandeps, dependency_flags)))
5757
end
5858
local outdata, errdata = os.iorunv(clangscandeps, dependency_flags)
59-
assert(errdata, errdata)
59+
assert(outdata, errdata)
6060

6161
io.writefile(jsonfile, outdata)
6262
else
@@ -73,7 +73,7 @@ function generate_dependency_for(target, sourcefile, opt)
7373
end)
7474
local ifile = path.translate(path.join(outputdir, path.filename(file) .. ".i"))
7575
compflags = table.join(compflags or {}, keepsystemincludesflag or {}, {"-E", "-x", "c++", file, "-o", ifile})
76-
os.vrunv(compinst:program(), compflags)
76+
os.vexecv(compinst:program(), compflags)
7777
local content = io.readfile(ifile)
7878
os.rm(ifile)
7979
return content

0 commit comments

Comments
 (0)