aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi-test
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-08-29 19:23:14 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-08-29 19:23:14 +0900
commit28b25ef27eccc0a800a1cbd3d3ea2c8f8494ca1e (patch)
tree9b435ffbadd6227faa1a3f64ebeb50fa94e7a6d8 /meta-ivi-test
parent4248ecf683a27cbb75fa584e63cd786f18ad0013 (diff)
downloadmeta-ivi-28b25ef27eccc0a800a1cbd3d3ea2c8f8494ca1e.tar.gz
meta-ivi-28b25ef27eccc0a800a1cbd3d3ea2c8f8494ca1e.tar.bz2
meta-ivi-28b25ef27eccc0a800a1cbd3d3ea2c8f8494ca1e.zip
audiomanager: version up to 7.4
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_%.bbappend7
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc10
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch95
-rw-r--r--meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend8
4 files changed, 14 insertions, 106 deletions
diff --git a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
index ba56fef..5a90214 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanager_%.bbappend
@@ -10,18 +10,19 @@ EXTRA_OECMAKE_append = " -DWITH_TESTS=ON -DUSE_BUILD_LIBS=OFF \
-DCMAKE_SKIP_RPATH=ON \
"
+DEPENDS += "gtest gmock"
+
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}
+ 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.inc b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc
index a4111e3..d72db30 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/audiomanagerplugins_t.inc
@@ -1,6 +1,6 @@
#!/bin/sh
get_list() {
- return 4
+ return 5
}
get_title() {
@@ -22,13 +22,17 @@ run_1() {
}
run_2() {
- _run AmControlReceiverShadowTest $*
+ _run AmCommandSenderDbusSignalTest $*
}
run_3() {
- _run AmRoutingInterfaceCAPITests $*s
+ _run AmCommandSenderDbusTest $*s
}
run_4() {
+ _run AmRoutingInterfaceCAPITests $*
+}
+
+run_5() {
_run AmRoutingReceiveAsyncTest $*
}
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
deleted file mode 100644
index 9386af2..0000000
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins/remove_add_gmock.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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_%.bbappend b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend
index 4ca93e4..3692ff2 100644
--- a/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend
+++ b/meta-ivi-test/recipes-multimedia/audiomanager/audiomanagerplugins_%.bbappend
@@ -1,21 +1,19 @@
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " file://remove_add_gmock.patch \
+SRC_URI_append += " \
file://${BPN}_t.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.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}/* "