Merge lp:~mterry/qtmir/ms-compressed-timestamps into lp:qtmir
Status: | Rejected | ||||||||
---|---|---|---|---|---|---|---|---|---|
Rejected by: | Michael Terry | ||||||||
Proposed branch: | lp:~mterry/qtmir/ms-compressed-timestamps | ||||||||
Merge into: | lp:qtmir | ||||||||
Diff against target: |
74 lines (+21/-6) 3 files modified
src/common/timestamp_impl.h (+3/-3) tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+15/-0) tests/modules/General/timestamp_test.cpp (+3/-3) |
||||||||
To merge this branch: | bzr merge lp:~mterry/qtmir/ms-compressed-timestamps | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mir development team | Pending | ||
Review via email: mp+276048@code.launchpad.net |
Commit message
Hand Qt millisecond timestamps rather than nanosecond.
We do this by treating compressed timestamps as millisecond timestamps themselves. (We could alternately divide by 1000000 everywhere we use them, but since we use only use them when dealing with Qt, where we want to provide milliseconds, I figured this was less fragile.)
The new TimestampInMill
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Only tests so far, I'm going to run this with my u8 branch that noticed this problem and see if it's fixed. Will keep you posted.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA
Unmerged revisions
- 399. By Michael Terry
-
Treat compressed timestamps as milliseconds
FAILED: Continuous integration, rev:399 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 538/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 234 jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 234 jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 234/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ qtmir-vivid- i386-ci/ 116 jenkins. qa.ubuntu. com/job/ qtmir-wily- amd64-ci/ 271/console jenkins. qa.ubuntu. com/job/ qtmir-wily- armhf-ci/ 271/console jenkins. qa.ubuntu. com/job/ qtmir-wily- i386-ci/ 116/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/538/ rebuild
http://