Add the afb-test binding in the devel AGL image

This will build afb-test binding and tests it using PTest.

Bug-AGL: SPEC-1439

Change-Id: I75d1bbb0a780ca036ab0d653fdcbacda883122f9
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb
index 491c2f1..576f62c 100644 (file)
--- a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb
+++ b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb
@@ -4,6 +4,7 @@ LICENSE = "MIT"
 inherit packagegroup
 
 RDEPENDS_${PN} = "\
+       afb-test \
         strace \
         ldd \
         less \

diff --git a/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb
new file mode 100644 (file)
index 0000000..e846745
--- /dev/null
+++ b/meta-agl-profile-core/recipes-test/afb-test/afb-test_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Binding embedding test framework to test others binding"
+DESCRIPTION = "This make testing binding running with Application Framework binder \
+easier by simply test verb return as well as event reception."
+HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/app-afb-test"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+SECTION = "apps"
+
+SRC_URI = "gitsm://gerrit.automotivelinux.org/gerrit/apps/app-afb-test;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "bc634e0d890f8f3f51205f95187f639f73e864a7"
+
+DEPENDS += "lua"
+RDEPENDS_${PN} += "lua bash"
+RDEPENDS_${PN}-ptest += "af-binder"
+
+PV = "5.99-FF.RC4.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
+
+inherit cmake aglwgt pkgconfig ptest
+
+do_install_append() {
+       install -d ${D}${bindir}
+       install -m 775 ${B}/afm-test ${D}${bindir}/afm-test
+}
+

diff --git a/meta-agl-profile-core/recipes-test/afb-test/files/run-ptest b/meta-agl-profile-core/recipes-test/afb-test/files/run-ptest
new file mode 100644 (file)
index 0000000..883939a
--- /dev/null
+++ b/meta-agl-profile-core/recipes-test/afb-test/files/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+afm-test /usr/AGL/apps/testwgt/aftest-test.wgt

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index aa27c24..8a2c351 100644 (file)
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -18,6 +18,8 @@ DEPENDS_append = " af-binder"
 # for hal bindings genskel is required.
 DEPENDS_append = " af-binder-devtools-native"
 
+EXTRA_OECMAKE_append_agl-ptest = " -DBUILD_TEST_WGT=TRUE"
+
 do_aglwgt_package()  {
         cd ${B}
         ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package VERBOSE=TRUE || \
@@ -41,6 +43,7 @@ POST_INSTALL_SCRIPT ?= "${POST_INSTALL_LEVEL}-${PN}.sh"
 EXTRA_WGT_POSTINSTALL ?= ""
 
 do_aglwgt_deploy() {
+    TEST_WGT="*-test.wgt"
     if [ "${AGLWGT_AUTOINSTALL_${PN}}" = "0" ]
     then
         install -d ${D}/usr/AGL/apps/manualinstall
@@ -48,6 +51,12 @@ do_aglwgt_deploy() {
     else
         install -d ${D}/usr/AGL/apps/autoinstall
         install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/autoinstall
+
+       if [ "$(find ${D}/usr/AGL/apps/autoinstall -name ${TEST_WGT})" ]
+       then
+               install -d ${D}/usr/AGL/apps/testwgt
+               mv ${D}/usr/AGL/apps/autoinstall/*-test.wgt ${D}/usr/AGL/apps/testwgt
+       fi
     fi
 
     APP_FILES=""
@@ -68,6 +77,7 @@ EOF
 
 FILES_${PN} += "/usr/AGL/apps/autoinstall/*.wgt \
     /usr/AGL/apps/manualinstall/*.wgt \
+    /usr/AGL/apps/testwgt/*.wgt \
     ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
     "
 

diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc
index f7fc939..bee38fa 100644 (file)
--- a/templates/feature/agl-ptest/90_local.conf.inc
+++ b/templates/feature/agl-ptest/90_local.conf.inc
@@ -1,7 +1,9 @@
 
 # Enabling ptest in image ...
 
+OVERRIDES .= ":agl-ptest"
+EXTRA_OECMAKE_append = " -DBUILD_TEST_WGT=TRUE"
 DISTRO_FEATURES_append = " ptest"
 EXTRA_IMAGE_FEATURES_append = " ptest-pkgs"
 
-# / ptest
\ No newline at end of file
+# / ptest