[Differential] [Requested Changes To] D1726: Introduce a test server

[bshah (Bhushan Shah)]

bshah requested changes to this revision.
bshah added a reviewer: bshah.
bshah added a comment.
This revision now requires changes to proceed.


  While looking at cmake, I realized one issue.. and to verify this I tried to build it and it didn't even build.. :\

INLINE COMMENTS

> KF5WaylandConfig.cmake.in:10
> +    add_test(NAME ${testBinaryName}-kwayland-test COMMAND
> +            ${CMAKE_INSTALL_FULL_LIBEXECDIR}/org-kde-kf5-kwayland-testserver ${CMAKE_CURRENT_BINARY_DIR}/${testBinaryName}
> +    )

I've gut feeling this will not work on CI, I am 80% sure about this but can't verify because I can't build this at all.

It works for you and me because in your local setup all repos are installed in same prefix, so CMAKE_INSTALL_FULL_LIBEXECDIR is same for all repos, while on CI each repo gets its own prefix, So on CI, when you will be using this CMAKE_INSTALL_FULL_LIBEXEC_DIR will resolve to repo using (e.g. kwayland-integration) this function and not to install prefix of kwayland.

Change this line to,

  @CMAKE_INSTALL_FULL_LIBEXECDIR@/org-kde-kf5-kwayland-testserver ${CMAKE_CURRENT_BINARY_DIR}/${testBinaryName}

instead.

> testserver.cpp:140
> +                        m_seat->touchUp(it.value());
> +                        m_touchIdMapper.erase(it);
> +                    }

Actually this doesn't build for me.

  /home/bshah/kdesrc/source/kwayland/src/tools/testserver/testserver.cpp:140:47: error: no viable conversion from 'const QHash<int, int>::const_iterator' to 'QHash<int, int>::iterator'
                          m_touchIdMapper.erase(it);
                                                ^~
  /usr/include/qt/QtCore/qhash.h:296:11: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'const QHash<int, int>::const_iterator' to 'const QHash<int, int>::iterator &' for 1st argument
      class iterator
            ^
  /usr/include/qt/QtCore/qhash.h:296:11: note: candidate constructor (the implicit move constructor) not viable: no known conversion from 'const QHash<int, int>::const_iterator' to 'QHash<int, int>::iterator &&' for 1st argument
      class iterator
            ^
  /usr/include/qt/QtCore/qhash.h:453:29: note: passing argument to parameter 'it' here
      iterator erase(iterator it);
                              ^
  1 error generated.

(Using Qt 5.6)

REPOSITORY
  rKWAYLAND KWayland

REVISION DETAIL
  https://phabricator.kde.org/D1726

EMAIL PREFERENCES
  https://phabricator.kde.org/settings/panel/emailpreferences/

To: graesslin, sebas, Plasma, bshah
Cc: sebas, bshah, plasma-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20160601/5417ef37/attachment-0001.html>