From a525f24c3ee276323088708dee70ee9bf9ceddd0 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 5 Oct 2018 17:16:14 +0200 Subject: Unify test launch between target and native On a target, the binder process name is taken from the widget "id", now the native launcher script also launches the binder using the widget "id". As the controller searches its configuration file using the binder process middle name we need to differentiate between both "id" otherwise the wrong configuration file is used. The commit renames configuration file according to the new "id". Change-Id: I4a596dd1d54201a671bb68bf9aca6904286322c6 Signed-off-by: Romain Forlot --- conf.d/controller/etc/aft-afbtest.json | 22 ++++++++++++++++++++++ conf.d/controller/etc/aft-aft.json | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 conf.d/controller/etc/aft-afbtest.json delete mode 100644 conf.d/controller/etc/aft-aft.json (limited to 'conf.d/controller') diff --git a/conf.d/controller/etc/aft-afbtest.json b/conf.d/controller/etc/aft-afbtest.json new file mode 100644 index 0000000..c541c2b --- /dev/null +++ b/conf.d/controller/etc/aft-afbtest.json @@ -0,0 +1,22 @@ +{ + "id": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", + "metadata": { + "uid": "Test", + "version": "1.0", + "api": "aft", + "info": "Binding made to test other bindings", + "require": [ + "hello" + ] + }, + "testVerb": { + "uid": "launch_all_tests", + "info": "Launch all the tests", + "action": "lua://AFT#_launch_test", + "args": { + "trace": "hello", + "files": ["aftTest.lua","helloworld.lua"] + } + } +} diff --git a/conf.d/controller/etc/aft-aft.json b/conf.d/controller/etc/aft-aft.json deleted file mode 100644 index c541c2b..0000000 --- a/conf.d/controller/etc/aft-aft.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", - "metadata": { - "uid": "Test", - "version": "1.0", - "api": "aft", - "info": "Binding made to test other bindings", - "require": [ - "hello" - ] - }, - "testVerb": { - "uid": "launch_all_tests", - "info": "Launch all the tests", - "action": "lua://AFT#_launch_test", - "args": { - "trace": "hello", - "files": ["aftTest.lua","helloworld.lua"] - } - } -} -- cgit