Fix merge issues in develop

liamg / darktile

:waning_crescent_moon: Darktile is a GPU rendered terminal emulator designed for tiling window managers.

MIT License

3.04k stars 113 forks source link

Fix merge issues in develop #257

Closed mjs closed 5 years ago

mjs commented 5 years ago

Develop isn't compiling due to recently introduced issues.

maxhora commented 5 years ago

@mjs go test ./... hangs on Linux (locally as well). Not sure what it might be

maxhora commented 5 years ago

after long delay go test ./... finally passed locally, but still waiting for xvfb-run --server-args="-screen 0 1024x768x24" make test

maxhora commented 5 years ago

that should be related to unit tests updates in recent PR.

mjs commented 5 years ago

As per Slack, go test ./... and xvfb-run --server-args="-screen 0 1024x768x24" make test are working fine on my machine. Hopefully the addition of -timeout tells us something useful.