persistence-administrator: move *-test package to meta-ivi-test layer

Signes-off-by: Yong-iL Joh <yong-il.joh@windriver.com>

2 files changed, 23 insertions, 22 deletions

diff --git a/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend
new file mode 100644
index 0000000..c1cc200
--- /dev/null
+++ b/meta-ivi-test/recipes-extended/persistence-administrator/persistence-administrator_%.bbappend
@@ -0,0 +1,22 @@
+#
+# test
+#
+do_install_append() {
+   install -d ${D}/opt/tests/${PN}
+   mv ${S}/test/pers_svc_test/.libs/pers_admin_test_framework \
+       ${D}/opt/tests/${PN}
+   install -d ${D}/Data
+   install -m 0644 ${S}/test/pers_svc_test/webtool_export/resource2.tar.gz \
+       ${D}/Data
+}
+
+PACKAGES += "${PN}-test"
+DEPENDS_${PN}-test = "${PN}"
+
+FILES_${PN}-dbg += " \
+    /opt/tests/${PN}/.debug/* \
+    "
+FILES_${PN}-test = " \
+    /opt/tests/${PN}/* \
+    /Data/resource2.tar.gz \
+    "
diff --git a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
index 7525bfd..79b5dc0 100644
--- a/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
+++ b/meta-ivi/recipes-extended/persistence-administrator/persistence-administrator_1.0.5.bb
@@ -28,26 +28,5 @@ SYSTEMD_AUTO_ENABLE = "disable"
 do_install_append() {
    perl -pi -e 's/dbus-public-bus.service/dbus.service/' \
 	${D}/lib/systemd/system/pas-daemon.service
-   install -d ${D}/Data
-   install -m 0644 ${S}/test/pers_svc_test/webtool_export/resource2.tar.gz \
-        ${D}/Data
+   rm -f ${D}${bindir}/pers_admin_test_framework
 }
-
-#
-# test
-#
-PACKAGES += "${PN}-testenv"
-RDEPENDS_${PN} += "${PN}-testenv"
-
-FILES_${PN} = " \
-    ${sysconfdir}/dbus-1/* \
-    /lib/systemd/* \
-    ${bindir}/pers_admin_svc \
-    ${libdir}/*.so.* \
-    "
-
-FILES_${PN}-testenv = " \
-    ${bindir}/persadmin_tool \
-    ${bindir}/pers_admin_test_framework \
-    /Data/resource2.tar.gz \
-    "