diff options
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/wayland/wayland-ivi-extension/test-path.patch | 59 | ||||
| -rw-r--r-- | recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend | 3 | ||||
| -rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend (renamed from recipes-graphics/wayland/weston_1.11.0.bbappend) | 0 |
3 files changed, 35 insertions, 27 deletions
diff --git a/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch b/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch index 9de50187e..251bc58f0 100644 --- a/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch +++ b/recipes-graphics/wayland/wayland-ivi-extension/test-path.patch @@ -1,46 +1,55 @@ -diff -Naur old/ivi-input-api/test/CMakeLists.txt new/ivi-input-api/test/CMakeLists.txt ---- old/ivi-input-api/test/CMakeLists.txt 2015-10-20 00:25:36.000000000 +1000 -+++ new/ivi-input-api/test/CMakeLists.txt 2015-10-20 17:57:45.000000000 +1000 -@@ -66,14 +66,15 @@ +From fbe0d0fd35ff79561dc2da853f1b0903bfde428d Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae <changhyeok.bae@gmail.com> +Date: Thu, 1 Jun 2017 07:45:20 +0000 +Subject: [PATCH] test patch + +--- + ivi-input-api/test/CMakeLists.txt | 9 +++++---- + ivi-layermanagement-api/test/CMakeLists.txt | 7 ++++--- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/ivi-input-api/test/CMakeLists.txt b/ivi-input-api/test/CMakeLists.txt +index db05d0f..db3b745 100644 +--- a/ivi-input-api/test/CMakeLists.txt ++++ b/ivi-input-api/test/CMakeLists.txt +@@ -65,12 +65,13 @@ IF(BUILD_ILM_API_TESTS) + ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - IF(INSTALL_ILM_API_TESTS) -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-input-api) - ENDIF() +- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) ++ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) # use CTest ENABLE_TESTING() - ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmClient ${PROJECT_NAME}) - ADD_TEST(ilmControl ${PROJECT_NAME}) - ADD_TEST(ilmInput ${PROJECT_NAME}) -+ ADD_TEST(ilmCommon ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmClient ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmControl ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmInput ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) ++ ADD_TEST(ilmCommon {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) ++ ADD_TEST(ilmControl {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) ++ ADD_TEST(ilmInput {CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) ENDIF() -diff -Naur old/ivi-layermanagement-api/test/CMakeLists.txt new/ivi-layermanagement-api/test/CMakeLists.txt ---- old/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-20 00:25:36.000000000 +1000 -+++ new/ivi-layermanagement-api/test/CMakeLists.txt 2015-10-20 17:57:24.000000000 +1000 -@@ -64,13 +64,14 @@ +diff --git a/ivi-layermanagement-api/test/CMakeLists.txt b/ivi-layermanagement-api/test/CMakeLists.txt +index fe9a0a4..090d734 100644 +--- a/ivi-layermanagement-api/test/CMakeLists.txt ++++ b/ivi-layermanagement-api/test/CMakeLists.txt +@@ -63,11 +63,12 @@ IF(BUILD_ILM_API_TESTS) + ADD_DEPENDENCIES(${PROJECT_NAME} ${LIBS}) - IF(INSTALL_ILM_API_TESTS) -- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -+ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) - ENDIF() +- INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) ++ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/test/ivi-layermanagement-api) # use CTest ENABLE_TESTING() - ADD_TEST(ilmCommon ${PROJECT_NAME}) -- ADD_TEST(ilmClient ${PROJECT_NAME}) - ADD_TEST(ilmControl ${PROJECT_NAME}) + ADD_TEST(ilmCommon ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) -+ ADD_TEST(ilmClient ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) + ADD_TEST(ilmControl ${CMAKE_INSTALL_LIBEXECDIR}/test/${PROJECT_NAME}) ENDIF() +-- +2.7.4 + diff --git a/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend b/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend index 5a26c9a1b..9c29dee47 100644 --- a/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend +++ b/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend @@ -8,10 +8,9 @@ DISABLE_TEST = "-DBUILD_ILM_API_TESTS:BOOL=FALSE \ -DINSTALL_ILM_API_TESTS:BOOL=FALSE \ " -PACKAGECONFIG ??= "ilm_input test" +PACKAGECONFIG ??= "test" PACKAGECONFIG[test] = "${ENABLE_TEST},${DISABLE_TEST},gtest" - SRC_URI_append = "\ file://cmake-find-gtest.patch \ file://test-path.patch \ diff --git a/recipes-graphics/wayland/weston_1.11.0.bbappend b/recipes-graphics/wayland/weston_%.bbappend index c6979e08e..c6979e08e 100644 --- a/recipes-graphics/wayland/weston_1.11.0.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend |