aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi-test
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-09-21 18:29:42 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-09-23 10:13:16 +0900
commit16c78f7c57f2dd6e15c517233bd6a042ca58ef0b (patch)
treef973c6a1f85d69e83d63ba9f02d0b9e00b48a6e7 /meta-ivi-test
parent482b222ea4306632df3c3e65a98c3cbff248d0db (diff)
downloadmeta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.tar.gz
meta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.tar.bz2
meta-ivi-16c78f7c57f2dd6e15c517233bd6a042ca58ef0b.zip
audiomanager: add version 7.0
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
Diffstat (limited to 'meta-ivi-test')
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend27
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend)4
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc34
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc)0
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch95
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend22
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend (renamed from meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend)7
7 files changed, 184 insertions, 5 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend
new file mode 100644
index 0000000..ba56fef
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.0.bbappend
@@ -0,0 +1,27 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI_append += " \
+ file://${BPN}_t.inc \
+ "
+
+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 \
+ "
+
+do_install_append() {
+ 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 ${B}/googleMock/gtest/libgtest_dll.so ${D}/opt/tests/${PN}
+
+ install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+}
+
+PACKAGES += " ${PN}-test"
+
+FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend
index 5a90214..0647b46 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_7.4.bbappend
@@ -19,10 +19,10 @@ do_install_append() {
install -m 0755 ${i} ${D}/opt/tests/${PN}
done
- install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+ install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
}
PACKAGES += " ${PN}-test"
FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
-FILES_${PN}-test = "/opt/tests/${PN}/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc
new file mode 100644
index 0000000..a4111e3
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.0.inc
@@ -0,0 +1,34 @@
+#!/bin/sh
+get_list() {
+ return 4
+}
+
+get_title() {
+ echo "audiomanagerplugins"
+}
+
+_run_dir=/opt/tests/audiomanagerplugins
+_run() {
+ if [ "x${2}" != "x" ]; then
+ ${_run_dir}/$1 > /tmp/t
+ tail /tmp/t | grep -E 'PASS|FAIL'
+ else
+ ${_run_dir}/$1
+ fi
+}
+
+run_1() {
+ _run AmCommandSenderCAPITest $*
+}
+
+run_2() {
+ _run AmControlReceiverShadowTest $*
+}
+
+run_3() {
+ _run AmRoutingInterfaceCAPITests $*s
+}
+
+run_4() {
+ _run AmRoutingReceiveAsyncTest $*
+}
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc
index d72db30..d72db30 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t-7.4.inc
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch
new file mode 100644
index 0000000..9386af2
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch
@@ -0,0 +1,95 @@
+diff --git a/PluginCommandInterfaceCAPI/CMakeLists.txt b/PluginCommandInterfaceCAPI/CMakeLists.txt
+index a5ec2fc..5e8e4fe 100644
+--- a/PluginCommandInterfaceCAPI/CMakeLists.txt
++++ b/PluginCommandInterfaceCAPI/CMakeLists.txt
+@@ -31,12 +31,6 @@ if (NOT DAEMONVERSION)
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif(NOT TARGET gtest)
+- endif(WITH_TESTS)
+-
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+ message(FATAL_ERROR "Could not find audiomanager cmake configuration")
+diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt
+index 225fdc6..d6ef7e8 100644
+--- a/PluginCommandInterfaceDbus/CMakeLists.txt
++++ b/PluginCommandInterfaceDbus/CMakeLists.txt
+@@ -26,11 +26,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginControlInterface/CMakeLists.txt b/PluginControlInterface/CMakeLists.txt
+index 137ca8f..53d71f3 100644
+--- a/PluginControlInterface/CMakeLists.txt
++++ b/PluginControlInterface/CMakeLists.txt
+@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceAsync/CMakeLists.txt b/PluginRoutingInterfaceAsync/CMakeLists.txt
+index 85a7a04..010b7ee 100644
+--- a/PluginRoutingInterfaceAsync/CMakeLists.txt
++++ b/PluginRoutingInterfaceAsync/CMakeLists.txt
+@@ -29,11 +29,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceCAPI/CMakeLists.txt b/PluginRoutingInterfaceCAPI/CMakeLists.txt
+index 7b4b1af..bf52e4a 100644
+--- a/PluginRoutingInterfaceCAPI/CMakeLists.txt
++++ b/PluginRoutingInterfaceCAPI/CMakeLists.txt
+@@ -30,11 +30,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- if(NOT TARGET gtest)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif()
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
+diff --git a/PluginRoutingInterfaceDBus/CMakeLists.txt b/PluginRoutingInterfaceDBus/CMakeLists.txt
+index e08b591..09a0696 100644
+--- a/PluginRoutingInterfaceDBus/CMakeLists.txt
++++ b/PluginRoutingInterfaceDBus/CMakeLists.txt
+@@ -26,9 +26,6 @@ if (NOT DAEMONVERSION)
+ include ("${AUDIOMANAGER_CMAKE_CONFIG_PATH}/audiomanagerConfig.cmake")
+ set(PLUGINS_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+ set(TEST_EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+- if(WITH_TESTS)
+- add_subdirectory(${GOOGLE_MOCK_PROJECT_FOLDER} ${CMAKE_CURRENT_BINARY_DIR}/gmock)
+- endif(WITH_TESTS)
+
+ set(COMMONAPI_DBUS_CONFIGURATIONS "")
+ else(AUDIOMANAGER_FOUND)
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend
new file mode 100644
index 0000000..cda5a2c
--- /dev/null
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bbappend
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+SRC_URI_append += " \
+ file://remove_add_gmock.patch \
+ file://${BPN}_t-${PV}.inc \
+ "
+
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
+EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON"
+
+DEPENDS += "gtest gmock"
+
+do_install_append() {
+ make plugin-test-install
+ mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN}
+
+ install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc
+}
+
+PACKAGES += " ${PN}-test"
+
+FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend
index 3692ff2..356808c 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bbappend
@@ -1,8 +1,9 @@
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
SRC_URI_append += " \
- file://${BPN}_t.inc \
+ file://${BPN}_t-${PV}.inc \
"
+EXTRA_OECMAKE_remove = "-DWITH_TESTS=OFF"
EXTRA_OECMAKE_append = " -DWITH_TEST_CONTROLLER=ON -DWITH_TESTS=ON"
DEPENDS += "gtest gmock"
@@ -10,10 +11,10 @@ DEPENDS += "gtest gmock"
do_install_append() {
mv ${D}/opt/tests/audiomanager ${D}/opt/tests/${PN}
- install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
+ install -m 0755 ${WORKDIR}/${BPN}_t-${PV}.inc ${D}/opt/tests/${PN}/${BPN}_t.inc
}
PACKAGES += " ${PN}-test"
FILES_${PN}-dbg += "/opt/tests/${PN}/.debug/* "
-FILES_${PN}-test = "/opt/tests/${PN}/* "
+FILES_${PN}-test = "/opt/tests/${PN}/ "