git.iko.soy/unity8
on xenial help sign in
Merge test fixes
c6df1f0Michał Sawicz
tests/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -47,7 +47,7 @@ macro(unity8_parse_arguments)
47 if(U8TEST_LIGHTDM)
47 if(U8TEST_LIGHTDM)
48 list(APPEND ld_paths
48 list(APPEND ld_paths
49 ${UNITY_MOCKPATH}/libusermetrics
49 ${UNITY_MOCKPATH}/libusermetrics
50− ${UNITY_MOCKPATH}/LightDM/liblightdm
50+ ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm
51 )
51 )
52 endif()
52 endif()
53
53
tests/qmltests/Dash/tst_Card.qml+2−2
@@ -473,14 +473,14 @@ Rectangle {
473
473
474 card.cardData["mascot"] = "somethingbroken2";
474 card.cardData["mascot"] = "somethingbroken2";
475 card.cardDataChanged();
475 card.cardDataChanged();
476− compare(mascotImage.image.status, Image.Error);
476+ compare(mascotImage.status, Image.Error);
477
477
478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};
478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};
479 cardTool.componentsChanged();
479 cardTool.componentsChanged();
480 card.cardData["mascot"] = "somethingbroken2";
480 card.cardData["mascot"] = "somethingbroken2";
481 card.cardDataChanged();
481 card.cardDataChanged();
482 waitForRendering(card);
482 waitForRendering(card);
483− tryCompare(mascotImage.image, "status", Image.Ready);
483+ tryCompare(mascotImage, "status", Image.Ready);
484 }
484 }
485
485
486 function test_font_weights_data() {
486 function test_font_weights_data() {