diff --git a/s/runtests b/s/runtests index fbc466e0e..8a97f1060 100755 --- a/s/runtests +++ b/s/runtests @@ -17,6 +17,6 @@ fi $ROOT/$BIN_DIR/eressea/test_eressea cd $ROOT -$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/runtests.lua +$ROOT/$BIN_DIR/eressea/eressea -v0 scripts/run-tests.lua #grep ERROR eressea.log cd $OLDWPD diff --git a/scripts/eressea/init.lua b/scripts/eressea/init.lua index 75e863a9a..a5947dc50 100644 --- a/scripts/eressea/init.lua +++ b/scripts/eressea/init.lua @@ -1,6 +1,6 @@ if config.paths ~= nil then for path in string.gmatch(config.paths, "([^:]+)") do - package.path = package.path .. ';' .. path .. '\\?.lua;' .. path .. '\\?\\init.lua' + package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua' end end print(package.path) diff --git a/scripts/run-tests.lua b/scripts/run-tests.lua index 570d839e2..4953645b8 100644 --- a/scripts/run-tests.lua +++ b/scripts/run-tests.lua @@ -2,14 +2,12 @@ path = 'scripts' if config.source_dir ~= nil then - path = config.source_dir .. '\\' .. path + path = config.source_dir .. '/' .. path end -package.path = package.path .. ';' .. path .. '\\?.lua;' .. path .. '\\?\\init.lua' +package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua' --- require 'eressea.tests' -if config.rules ~= nil then - require ('eressea.' .. config.rules .. '.tests') -end +require 'eressea' +require 'eressea.tests' require 'lunit' - +read_xml() lunit.main() diff --git a/scripts/run-turn.lua b/scripts/run-turn.lua index 7457c28f3..98fafe673 100644 --- a/scripts/run-turn.lua +++ b/scripts/run-turn.lua @@ -183,9 +183,9 @@ end path = 'scripts' if config.source_dir ~= nil then - path = config.source_dir .. '\\' .. path + path = config.source_dir .. '/' .. path end -package.path = package.path .. ';' .. path .. '\\?.lua;' .. path .. '\\?\\init.lua' +package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua' rules = require('eressea.' .. config.rules) read_xml()