diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-08-03 16:49:16 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-08-16 13:52:02 +0000 |
| commit | fcb49fe8d3442b5299227279185f143da3e67b69 (patch) | |
| tree | eb3ac5a8b66a3a1b345db0858c670b5e8b7b4a79 | |
| parent | 1990ea3677f10bab3dc3cc7b7f8f1c50a399d5d4 (diff) | |
Search in the binding root dir for lua materialsflounder_5.99.3flounder/5.99.35.99.3
Change-Id: I09f174c99488ff104aaa7995e1575a5e5aa3a0c0
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| m--------- | app-controller-submodule | 0 | ||||
| -rw-r--r-- | conf.d/controller/lua.d/aft.lua | 9 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app-controller-submodule b/app-controller-submodule -Subproject 9ba5c8f531fc371d5402ea28467029bd3e95f98 +Subproject e3f2c45eb9c65560f269be9d2a1f4385142c457 diff --git a/conf.d/controller/lua.d/aft.lua b/conf.d/controller/lua.d/aft.lua index 2c88c61..900f3ca 100644 --- a/conf.d/controller/lua.d/aft.lua +++ b/conf.d/controller/lua.d/aft.lua @@ -580,6 +580,8 @@ end function _launch_test(context, args) _AFT.context = context + local bindingRootDir = AFB:getrootdir() + local loadedfile = nil -- Prepare the tests execution configuring the monitoring and loading -- lua test files to execute in the Framework. @@ -593,12 +595,15 @@ function _launch_test(context, args) end end end + if args.files and type(args.files) == 'table' then for _,f in pairs(args.files) do - dofile('var/'..f) + local cmdHandle = io.popen('find '..bindingRootDir..'-name '..f) + loadedfile = dofile(cmdHandle:read()) end elseif type(args.files) == 'string' then - dofile('var/'..args.files) + local cmdHandle = io.popen('find '..bindingRootDir..'-name '..args.files) + loadedfile = dofile(cmdHandle:read()) end -- Execute the test within a context if given. We assume that the before |