git.iko.soy/unity8
on xenial help sign in
really install cardcreatortest.js in right place
1ed13b6Michael Terry
cmake/modules/QmlTest.cmake+3−1
compare with xenial
unifiedsplit
@@ -93,7 +93,9 @@ function(add_qml_test_data PATH COMPONENT_NAME)
93 file(WRITE "${filename}" "${contents}")
93 file(WRITE "${filename}" "${contents}")
94 endif()
94 endif()
95
95
96+ if (TEST_DESTINATION)
96− if (NOT DESTINATION)
97+ set(DESTINATION "${TEST_DESTINATION}")
98+ else()
97 file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
99 file(RELATIVE_PATH relcurpath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
98 set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")
100 set(DESTINATION "${SHELL_APP_DIR}/${relcurpath}/${PATH}")
99 endif()
101 endif()
tests/plugins/Dash/CMakeLists.txt+1−1
@@ -86,7 +86,7 @@ install(TARGETS CardCreatorTestExec
86 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
86 DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Dash"
87)
87)
88add_unity8_uitest(CardCreator CardCreatorTestExec DEPENDS Dash-qml)
88add_unity8_uitest(CardCreator CardCreatorTestExec DEPENDS Dash-qml)
89−install(DIRECTORY cardcreator DESTINATION "${SHELL_APP_DIR}/tests/plugins/Dash")
89+add_qml_test_data(. cardcreator)
90
90
91# This one qml file imports a file in an arch-specific directory, so to make its
91# This one qml file imports a file in an arch-specific directory, so to make its
92# import line relative, we install it into an arch-specific directory too.
92# import line relative, we install it into an arch-specific directory too.