aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-04-15 19:11:40 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-04-15 23:13:38 +0900
commit997a4c4d8cf3f40eed0dd7fd186f18e6c88df85d (patch)
tree253e0c8fc12d570b6faf4c4fb976a9118bbd8257
parent48b419d6f52832d9eb8a156661c2c6a35a678ebe (diff)
downloadmeta-ivi-997a4c4d8cf3f40eed0dd7fd186f18e6c88df85d.tar.gz
meta-ivi-997a4c4d8cf3f40eed0dd7fd186f18e6c88df85d.tar.bz2
meta-ivi-997a4c4d8cf3f40eed0dd7fd186f18e6c88df85d.zip
audiomanager: fix up for build error due to adding -tests packageL-1.1
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend22
-rw-r--r--meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb1
2 files changed, 11 insertions, 12 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
index cf552b7..e6b91a5 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
@@ -1,23 +1,21 @@
-EXTRA_OECMAKE = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
+EXTRA_OECMAKE_append = " -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
+ mkdir -p ${D}/opt/tests/${PN}
+
+ for i in `find ${B}/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}
+ install -m 0755 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN}
}
-FILES_${PN}-dbg += " \
- /opt/tests/${PN}/.debug/* \
- "
-FILES_${PN}-test = " \
- /opt/tests/${PN}/* \
- "
+PACKAGES += " ${PN}-test"
+
+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 2f85b52..5a97540 100644
--- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb
+++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb
@@ -23,6 +23,7 @@ SYSTEMD_SERVICE_${PN} = "AudioManager.service"
SYSTEMD_AUTO_ENABLE = "disable"
OECMAKE_CXX_FLAGS +="-ldl"
+EXTRA_OECMAKE = " -DWITH_TESTS=OFF"
FILES_${PN} = " \
${bindir}/* \