5285851 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Make xvfbtests work in the DashView plugins

5285851Albert Astals12 years ago

cmake/modules/QmlTest.cmake−2

compare with xenial

unifiedsplit

@@ -156,8 +156,6 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

156

157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)

158 add_dependencies(qmluitests xvfbtest${CLASS_NAME})

159−

160− add_manual_qml_test(. ${CLASS_NAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

161endmacro(add_binary_qml_test)

159endmacro(add_binary_qml_test)

162

160

163macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

161macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

tests/plugins/DashViews/CMakeLists.txt+23−35

@@ -25,46 +25,41 @@ remove_definitions(-DQT_NO_KEYWORDS)

25add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

26add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")

28+macro(add_lvwph_test FILENAME TESTNAME)

29+ add_executable(${TESTNAME}TestExec

30+ ${FILENAME}test.cpp

28−add_executable(listviewwithpageheadertestExec listviewwithpageheadertest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

31+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

29−qt5_use_modules(listviewwithpageheadertestExec Test Core Qml)

32+ qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

30−target_link_libraries(listviewwithpageheadertestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

33+ target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

31−add_custom_target(testlistviewwithpageheader ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheader.xml,xunitxml -o -,txt)

33−add_executable(listviewwithpageheadertestsectionExec listviewwithpageheadertestsection.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

35+ add_binary_qml_test(${TESTNAME} "" "DashViews-qml")

34−qt5_use_modules(listviewwithpageheadertestsectionExec Test Core Qml)

36+endmacro()

35−target_link_libraries(listviewwithpageheadertestsectionExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

36−add_custom_target(testlistviewwithpageheadersection ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestsectionExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheadersection.xml,xunitxml -o -,txt)

38−add_executable(listviewwithpageheadertestsectionexternalmodelExec listviewwithpageheadertestsectionexternalmodel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

38+add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)

39−qt5_use_modules(listviewwithpageheadertestsectionexternalmodelExec Test Core Qml)

39+add_lvwph_test(listviewwithpageheadersection ListViewWithPageHeaderSection)

40−target_link_libraries(listviewwithpageheadertestsectionexternalmodelExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

40+add_lvwph_test(listviewwithpageheadersectionexternalmodel ListViewWithPageHeaderSectionExternalModel)

41−add_custom_target(testlistviewwithpageheadersectionexternalmodel ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestsectionexternalmodelExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheadersectionexternalmodel.xml,xunitxml -o -,txt)

43macro(add_dashview_try_test FILENAME TESTNAME)

42macro(add_dashview_try_test FILENAME TESTNAME)

44− add_executable(${FILENAME}testExec

43+ add_executable(${TESTNAME}TestExec

45 ${FILENAME}test.cpp

44 ${FILENAME}test.cpp

46 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

45 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

47 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

46 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

48 )

47 )

49− qt5_use_modules(${FILENAME}testExec Test Core Qml)

48+ qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

50− target_link_libraries(${FILENAME}testExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

49+ target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

51− add_custom_target(test${TESTNAME}

52− ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}testExec

53− -o ${CMAKE_BINARY_DIR}/test${TESTNAME}.xml,xunitxml

54− -o -,txt

55− DEPENDS ${FILENAME}testExec DashViews-qml

56− )

51+ add_binary_qml_test(${TESTNAME} "" "DashViews-qml")

52+

58− add_executable(${FILENAME}tryExec

53+ add_executable(${TESTNAME}tryExec

59 ${FILENAME}try.cpp

54 ${FILENAME}try.cpp

60 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

55 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

61 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

56 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

62 )

57 )

63− qt5_use_modules(${FILENAME}tryExec Test Core Qml)

58+ qt5_use_modules(${TESTNAME}tryExec Test Core Qml)

64− target_link_libraries(${FILENAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

59+ target_link_libraries(${TESTNAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

65 add_custom_target(try${TESTNAME}

60 add_custom_target(try${TESTNAME}

66− ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}tryExec

61+ ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}tryExec

67− DEPENDS ${FILENAME}tryExec DashViews-qml

62+ DEPENDS ${TESTNAME}tryExec DashViews-qml

68 )

63 )

69endmacro()

64endmacro()

@@ -72,13 +67,6 @@ add_dashview_try_test(verticaljournal VerticalJournal)

72add_dashview_try_test(horizontaljournal HorizontalJournal)

67add_dashview_try_test(horizontaljournal HorizontalJournal)

73add_dashview_try_test(organicgrid OrganicGrid)

68add_dashview_try_test(organicgrid OrganicGrid)

70+set(qmltest_DEFAULT_TARGETS qmluitests)

75set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

71set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

76−add_qml_test(. listviewwithpageheaderqml IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

72+add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

77−

78−add_dependencies(qmluitests testlistviewwithpageheader)

79−add_dependencies(qmluitests testlistviewwithpageheadersection)

80−add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)

81−add_dependencies(qmluitests testlistviewwithpageheaderqml)

82−add_dependencies(qmluitests testVerticalJournal)

83−add_dependencies(qmluitests testHorizontalJournal)

84−add_dependencies(qmluitests testOrganicGrid)

tests/plugins/DashViews/listviewwithpageheadertestsectionexternalmodel.cpp → tests/plugins/DashViews/listviewwithpageheadersectionexternalmodeltest.cpprenamed+1−1

@@ -248,4 +248,4 @@ private:

248

249QTEST_MAIN(ListViewWithPageHeaderTestSection)

250

251−#include "listviewwithpageheadertestsectionexternalmodel.moc"

251+#include "listviewwithpageheadersectionexternalmodeltest.moc"

tests/plugins/DashViews/listviewwithpageheadertestsection.cpp → tests/plugins/DashViews/listviewwithpageheadersectiontest.cpprenamed+1−1

@@ -2166,4 +2166,4 @@ private:

2166

2167QTEST_MAIN(ListViewWithPageHeaderTestSection)

2168

2169−#include "listviewwithpageheadertestsection.moc"

2169+#include "listviewwithpageheadersectiontest.moc"

tests/plugins/DashViews/tst_listviewwithpageheaderqml.qml → tests/plugins/DashViews/tst_ListViewWithPageHeaderQML.qmlrenamed

The content is the same.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1

@@ -20,6 +20,7 @@ macro(add_gesture_ui_test CLASSNAME)

20 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)

22 add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles)

23+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

23endmacro(add_gesture_ui_test)

24endmacro(add_gesture_ui_test)

25macro(add_gesture_test CLASSNAME)

26macro(add_gesture_test CLASSNAME)

tests/qmltests/Components/CMakeLists.txt+1

@@ -11,6 +11,7 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

11target_link_libraries(DragHandleTestExec UbuntuGestureQml)

13add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")

14+add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

15add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

16add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

16add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

17add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")