aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi-test
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2017-05-31 14:52:28 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2017-06-16 21:36:40 +0900
commit3d3aad2282e41225de95ff7527e31c9e459f297e (patch)
tree5ea3c057da369fc30d91205db4b5d72751f0a48f /meta-ivi-test
parent9d5a45e473fbb3a29f5e0e0ffe45587523196be5 (diff)
downloadmeta-ivi-3d3aad2282e41225de95ff7527e31c9e459f297e.tar.gz
meta-ivi-3d3aad2282e41225de95ff7527e31c9e459f297e.tar.bz2
meta-ivi-3d3aad2282e41225de95ff7527e31c9e459f297e.zip
node-startup-controller: resolve confliction of *.conf files of dbus
- use it if NSC's test runs Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
Diffstat (limited to 'meta-ivi-test')
-rw-r--r--meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc17
-rw-r--r--meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend2
2 files changed, 18 insertions, 1 deletions
diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc
index 6516461..43a92f7 100644
--- a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc
+++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller/node-startup-controller_t.inc
@@ -23,16 +23,31 @@ _luc_check() {
done
}
_run_() {
+ systemctl stop dbus
+ if [ ! -d ${_run_dir}/bak ]; then
+ mkdir ${_run_dir}/bak
+ cp -f etc/dbus-1/system.d/org.genivi.NodeStartupController1.conf ${_run_dir}/bak
+ cp -f etc/dbus-1/system.d/org.genivi.NodeStateManager.conf ${_run_dir}/bak
+ fi
+ cp -f ${_run_dir}/etc/dbus-1/system.d/org.*.conf /etc/dbus-1/system.d
+ systemctl start dbus
+
systemctl start dlt-receive
- systemctl start nsm-dummy
systemctl start node-startup-controller
+ systemctl start nsm-dummy
_luc_check
${_run_dir}/${1}
+ systemctl stop nsm-dummy
systemctl stop node-startup-controller
+ sleep 1
systemctl stop nsm-dummy
#systemctl stop dlt-receive
+
+ systemctl stop dbus
+ cp -f ${_run_dir}/bak/org.*.conf /etc/dbus-1/system.d
+ systemctl start dbus
}
_check_luc_test_01() {
diff --git a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend
index 1d8e2a1..553c14c 100644
--- a/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend
+++ b/meta-ivi-test/recipes-extended/node-startup-controller/node-startup-controller_%.bbappend
@@ -13,6 +13,8 @@ do_install_append() {
install -m 0644 ${WORKDIR}/helper/*.service ${D}/${systemd_unitdir}/system
install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+
+ mv ${D}/etc ${D}/opt/tests/${PN}
}
FILES_${PN}-nsm-dummy += " \