mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-09 16:12:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix CI failures

Browse Source
This commit is contained in:
ZyX
2017-03-17 10:57:19 +03:00
parent 0320a58082
commit 0e9286a19e
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/unit/preprocess.lua
View File

@@ -4,8 +4,8 @@
local ffi = require("ffi")
local global_helpers = require('test.helpers')
local popen_r = global_helpers.popen_r
local argss_to_cmd = global_helpers.argss_to_cmd
local repeated_popen_r = global_helpers.repeated_popen_r
local ccs = {}
@@ -157,28 +157,15 @@ function Gcc:dependencies(hdr)
end
end
local function repeated_call(...)
for _ = 1, 10 do
local stream = popen_r(...)
local ret = stream:read('*a')
stream:close()
if ret then
return ret
end
end
print('ERROR: preprocess.lua: Failed to execute ' .. cmd .. ': nil return after 10 attempts')
return nil
end
function Gcc:filter_standard_defines(defines)
if not self.standard_defines then
local pseudoheader_fname = 'tmp_empty_pseudoheader.h'
local pseudoheader_file = io.open(pseudoheader_fname, 'w')
pseudoheader_file:close()
local standard_defines = repeated_call(self.path,
self.preprocessor_extra_flags,
self.get_defines_extra_flags,
{pseudoheader_fname})
local standard_defines = repeated_popen_r(self.path,
self.preprocessor_extra_flags,
self.get_defines_extra_flags,
{pseudoheader_fname})
os.remove(pseudoheader_fname)
self.standard_defines = {}
for line in standard_defines:gmatch('[^\n]+') do
@@ -207,9 +194,9 @@ function Gcc:preprocess(previous_defines, ...)
pseudoheader_file:flush()
pseudoheader_file:close()
local defines = repeated_call(self.path, self.preprocessor_extra_flags,
self.get_defines_extra_flags,
{pseudoheader_fname})
local defines = repeated_popen_r(self.path, self.preprocessor_extra_flags,
self.get_defines_extra_flags,
{pseudoheader_fname})
defines = self:filter_standard_defines(defines)
-- lfs = require("lfs")
@@ -218,9 +205,10 @@ function Gcc:preprocess(previous_defines, ...)
-- io.stderr\write("CWD: #{lfs.currentdir!}\n")
-- io.stderr\write("CMD: #{cmd}\n")
local declarations = repeated_call(self.path, self.preprocessor_extra_flags,
self.get_declarations_extra_flags,
{pseudoheader_fname})
local declarations = repeated_popen_r(self.path,
self.preprocessor_extra_flags,
self.get_declarations_extra_flags,
{pseudoheader_fname})
os.remove(pseudoheader_fname)