zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wip

This commit is contained in:
Hisham Muhammad 2015-04-02 02:13:18 -03:00
parent d880def0e9 e5b08447fe
commit 4e29cad4fe
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test_spec.lua
View File

@ -12,6 +12,16 @@ local rote = require("rote")
local rt = rote.RoteTerm(24, 80) local rt = rote.RoteTerm(24, 80)
local function os_execread(cmd)
local fd = io.popen(cmd, "r")
local out = fd:read("*a")
fd:close()
return (out:gsub("\n$", ""))
end
local branch = os_execread("git branch | grep '*'"):sub(3)
print("Running in branch "..branch)
os.execute("make coverage") os.execute("make coverage")
os.execute("rm -f *.gcda */*.gcda") os.execute("rm -f *.gcda */*.gcda")
os.execute("rm -f coverage.info test.htoprc") os.execute("rm -f coverage.info test.htoprc")
@ -110,7 +120,7 @@ local y_panelhdr = (function()
end end
end)() or 1 end)() or 1
local x_metercol2 = 43 local x_metercol2 = (branch == "wip") and 41 or 43
show() show()