git.iko.soy/unity8
on xenial help sign in
Fixes to the journal cmake tests code
c86e529Albert Astals
tests/plugins/DashViews/CMakeLists.txt+3−5
compare with xenial
unifiedsplit
@@ -55,7 +55,7 @@ macro(add_journal_try_test FILENAME)
55 target_link_libraries(${FILENAME}testExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
55 target_link_libraries(${FILENAME}testExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
56 add_custom_target(test${CUSTOM_TARGET_NAME}
56 add_custom_target(test${CUSTOM_TARGET_NAME}
57 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}testExec
57 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}testExec
58− -o ${CMAKE_BINARY_DIR}/testVerticalJournal.xml,xunitxml
58+ -o ${CMAKE_BINARY_DIR}/test${CUSTOM_TARGET_NAME}.xml,xunitxml
59 -o -,txt
59 -o -,txt
60 DEPENDS ${FILENAME}testExec DashViews-qml
60 DEPENDS ${FILENAME}testExec DashViews-qml
61 )
61 )
@@ -69,8 +69,6 @@ macro(add_journal_try_test FILENAME)
69 target_link_libraries(${FILENAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
69 target_link_libraries(${FILENAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
70 add_custom_target(try${CUSTOM_TARGET_NAME}
70 add_custom_target(try${CUSTOM_TARGET_NAME}
71 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}tryExec
71 ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}tryExec
72− -o ${CMAKE_BINARY_DIR}/testVerticalJournal.xml,xunitxml
73− -o -,txt
74 DEPENDS ${FILENAME}tryExec DashViews-qml
72 DEPENDS ${FILENAME}tryExec DashViews-qml
75 )
73 )
76endmacro()
74endmacro()
@@ -85,5 +83,5 @@ add_dependencies(qmluitests testlistviewwithpageheader)
85add_dependencies(qmluitests testlistviewwithpageheadersection)
83add_dependencies(qmluitests testlistviewwithpageheadersection)
86add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)
84add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)
87add_dependencies(qmluitests testlistviewwithpageheaderqml)
85add_dependencies(qmluitests testlistviewwithpageheaderqml)
88−add_dependencies(qmluitests testVerticalJournal)
86+add_dependencies(qmluitests testVerticaljournal)
89−add_dependencies(qmluitests testHorizontalJournal)
87+add_dependencies(qmluitests testHorizontaljournal)