diff options
| -rw-r--r-- | meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend | 23 | ||||
| -rw-r--r-- | meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb | 14 |
2 files changed, 24 insertions, 13 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend new file mode 100644 index 0000000..cf552b7 --- /dev/null +++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend @@ -0,0 +1,23 @@ + +EXTRA_OECMAKE = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \ + -DTEST_EXECUTABLE_INSTALL_PATH=/opt/tests/${PN}/ \ + -Dgmock_build_tests=ON -Dgtest_build_samples=ON -Dgtest_build_tests=ON \ + -DCMAKE_SKIP_RPATH=ON \ + " + +PACKAGES += " ${PN}-test" +do_install_append() { + cd ${WORKDIR}/build + install -d ${D}/opt/tests/${PN} + for i in `find bin/ -type f -regex '.*[tT]est.*'`; do + install -m 0755 ${i} ${D}/opt/tests/${PN} + done + install -m 0755 googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN} +} + +FILES_${PN}-dbg += " \ + /opt/tests/${PN}/.debug/* \ + " +FILES_${PN}-test = " \ + /opt/tests/${PN}/* \ + " diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index f4727b0..7009aa4 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -23,8 +23,6 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "AudioManager.service" SYSTEMD_AUTO_ENABLE = "disable" -#EXTRA_OECMAKE += "-DWITH_TESTS=OFF -DUSE_BUILD_LIBS=OFF" -PACKAGES += "${PN}-test " OECMAKE_CXX_FLAGS +="-ldl" FILES_${PN} = " \ @@ -33,14 +31,8 @@ FILES_${PN} = " \ ${systemd_unitdir}/scripts/setup_amgr.sh \ " FILES_${PN}-dev += " \ - ${libdir}/audiomanager/cmake* \ + ${libdir}/* \ " -FILES_${PN}-dbg += " \ - ${libdir}/audiomanager/tests/.debug/* \ - " -FILES_${PN}-test = " \ - ${libdir}/audiomanager/tests/* " - do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then mkdir -p ${D}${systemd_unitdir}/scripts/ @@ -52,8 +44,4 @@ do_install_append() { perl -pi -e \ 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ ${D}${libdir}/audiomanager/cmake/audiomanagerConfig.cmake - - tst=`find ${D} -name tests` - mv $tst ${D}${libdir}/audiomanager/ - rmdir -p `dirname $tst` || true } |