Merge lp:~vanvugt/mir/fix-1583970-1584603-1584605 into lp:mir

[Daniel van Vugt]

Fix all three failures seen lately in ClientLogging.reports_performance
LP: #1583970, LP: #1584603, LP: #1584605

It will be easier to pass CI if they're all fixed simultaneously.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3516
https://mir-jenkins.ubuntu.com/job/mir-ci/1016/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1110/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1158
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1149
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1120/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1120
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1120/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1120/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1120/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1120
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1120/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1016/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Good news!

The only failure is bug 1584601 now.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3517
https://mir-jenkins.ubuntu.com/job/mir-ci/1018/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1112/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1151
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1151
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1122/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1122
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1122/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1122/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1122/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1122
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1122/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1018/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Still bug 1584601

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3518
https://mir-jenkins.ubuntu.com/job/mir-ci/1023/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1118/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1166
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1157
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1157
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1128/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1128
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1128/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1128/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1128/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1128/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1023/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3519
https://mir-jenkins.ubuntu.com/job/mir-ci/1025/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1121
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1169
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1131
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1131/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1131
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1131/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1131
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1131/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1131
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1131/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1131
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1131/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1025/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Nice!

review: Approve

=== modified file 'tests/acceptance-tests/test_client_logging.cpp'
--- tests/acceptance-tests/test_client_logging.cpp	2016-05-18 09:16:16 +0000
+++ tests/acceptance-tests/test_client_logging.cpp	2016-05-24 08:19:27 +0000
@@ -107,13 +107,22 @@
             EXPECT_STREQ("Rumpelstiltskin", name);
             EXPECT_THAT(render, Gt(target_render_time.count() - 1));
 
-            // Not a great test, but it will catch LP: #1581368 while
-            // also dealing with the possibility that CI machines
-            // are super slow:
-            auto expected_frame_time = 1000.0f / target_fps;
-            EXPECT_THAT(render, Lt(expected_frame_time));
-            EXPECT_THAT(lag, Gt(expected_frame_time/2));
-            EXPECT_THAT(nbuffers, Eq(3));
+            // On a regular machine, render will be 3 (milliseconds) matching
+            // the above render loop. CI however is super-slow at times so
+            // we just check rendering completed in under one second.
+            // That's still easily enough to regression-test LP: #1581368
+            // where it had values in the millions.
+            EXPECT_THAT(render, Lt(1000));
+
+            EXPECT_THAT(lag, Gt(0.0f));
+
+            // In order to see all three buffers the client must be rendering
+            // at least in bursts faster than the compositor consumes them.
+            // On the surface of it the above render loop should appear to
+            // do that, but in reality we're feeding an unthottled fake
+            // compositor here so may never hit all three buffers...
+            EXPECT_THAT(nbuffers, Ge(2));
+
             ASSERT_FALSE(Test::HasFailure()) << "Log line = {" << line << "}";
         }
     }