D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson added a comment. We went from 7 failing unit tests on CI to..6! Progress, but not done. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
This revision was automatically updated to reflect the committed changes. Closed by commit R242:0ae178016adb: Copy PlasmaCore binary qmldir file structure into bin for unit tests (authored by davidedmundson). REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14743?vs=39614=39642 REVISION DETAIL https://phabricator.kde.org/D14743 AFFECTED FILES src/declarativeimports/core/CMakeLists.txt To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
dfaure accepted this revision. This revision is now accepted and ready to land. REPOSITORY R242 Plasma Framework (Library) BRANCH master REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson updated this revision to Diff 39614. davidedmundson added a comment. Update REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14743?vs=39458=39614 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14743 AFFECTED FILES src/declarativeimports/core/CMakeLists.txt To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson marked 2 inline comments as done. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
dfaure requested changes to this revision. dfaure added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > CMakeLists.txt:80 > +COMMAND ${CMAKE_COMMAND} -E > +copy > ${CMAKE_BINARY_DIR}/bin/libcorebindingsplugin.so > ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core/libcorebindingsplugin.so) > +add_custom_command(TARGET copy POST_BUILD The filename won't work on Windows. Here's more portable syntax: add_custom_command(TARGET copy POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core/) REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson updated this revision to Diff 39458. davidedmundson added a comment. Copy at build time REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14743?vs=39454=39458 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14743 AFFECTED FILES src/declarativeimports/core/CMakeLists.txt To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
dfaure requested changes to this revision. dfaure added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > CMakeLists.txt:73 > +# #also install to $BUILD_DIR/bin for unit tests > +install(TARGETS corebindingsplugin DESTINATION > ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core) > +install(FILES qmldir DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core) But that requires "make install", doesn't it? The CI won't do that. See kirigami, kservice or today's akademy presentation for the cmake commands to copy this at build time rather than at install time. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson updated this revision to Diff 39454. davidedmundson added a comment. whitespace REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D14743?vs=39453=39454 BRANCH master REVISION DETAIL https://phabricator.kde.org/D14743 AFFECTED FILES src/declarativeimports/core/CMakeLists.txt To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson retitled this revision from "Copy PlasmaCore binary qmldir file structure into bin for unit tests This way tests pass before installation." to "Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.". davidedmundson added a reviewer: dfaure. REPOSITORY R242 Plasma Framework (Library) REVISION DETAIL https://phabricator.kde.org/D14743 To: davidedmundson, #plasma, dfaure Cc: kde-frameworks-devel, michaelh, ngraham, bruns
D14743: Copy PlasmaCore binary qmldir file structure into bin for unit testsThis way tests pass before installation.
davidedmundson created this revision. davidedmundson added a reviewer: Plasma. Restricted Application added a project: Frameworks. Restricted Application added a subscriber: kde-frameworks-devel. davidedmundson requested review of this revision. TEST PLAN Before patch Created a broken env by unsetting QML2_IMPORT_PATH Ran test. It failed It passes. REPOSITORY R242 Plasma Framework (Library) BRANCH master REVISION DETAIL https://phabricator.kde.org/D14743 AFFECTED FILES src/declarativeimports/core/CMakeLists.txt To: davidedmundson, #plasma Cc: kde-frameworks-devel, michaelh, ngraham, bruns