Skip to content

Commit 3f61470

Browse files
committed
Add dev searchdirs as we do not issue make install on travis
1 parent fa77b0e commit 3f61470

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

test/integration/runtests.lua

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
print("[TESTING] Integration")
44

5+
local basedir = "../../"
6+
local notion_binary = basedir .. "notion/notion"
7+
local notionflux_binary = basedir .. "mod_notionflux/notionflux/notionflux"
8+
59
local running_on_travis = os.getenv('TRAVIS')
6-
local notion_binary = "../../notion/notion"
7-
local notionflux_binary = "../../mod_notionflux/notionflux/notionflux"
810
if running_on_travis then
911
print('TRAVIS detected')
10-
-- notion_binary = "/usr/local/bin/notion"
11-
-- notionflux_binary = "/usr/local/bin/notionflux"
1212
end
1313

1414
local success, posix = pcall(require, "posix")
@@ -74,7 +74,28 @@ for i,testset in ipairs(testsets) do
7474

7575
local notionpid = posix.fork()
7676
if (notionpid == 0) then
77-
local result,errstr,errno = posix.exec(notion_binary, "-noerrorlog", "-display", ":99")
77+
local result,errstr,errno = posix.exec(
78+
notion_binary,
79+
"-noerrorlog",
80+
"-s", basedir .. "contrib/scripts",
81+
"-s", basedir .. "de",
82+
"-s", basedir .. "etc",
83+
"-s", basedir .. "ioncore",
84+
"-s", basedir .. "mod_dock",
85+
"-s", basedir .. "mod_menu",
86+
"-s", basedir .. "mod_mgmtmode",
87+
"-s", basedir .. "mod_notionflux",
88+
"-s", basedir .. "mod_query",
89+
"-s", basedir .. "mod_sm",
90+
"-s", basedir .. "mod_sp",
91+
"-s", basedir .. "mod_statusbar",
92+
"-s", basedir .. "mod_statusbar/ion-statusd",
93+
"-s", basedir .. "mod_tiling",
94+
"-s", basedir .. "mod_xinerama",
95+
"-s", basedir .. "mod_xkbevents",
96+
"-s", basedir .. "mod_xrandr",
97+
"-display", ":99"
98+
)
7899
print('Error replacing current process with notion: ' .. errstr)
79100
os.exit(1)
80101
end

0 commit comments

Comments
 (0)