Merge lp:~albaguirre/mir/fix-make-release-checks into lp:mir

[Alberto Aguirre]

Fix make release-checks

The target should fail when symbols contain "unreleased" in their names.

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

PASSED: Continuous integration, rev:3275
https://mir-jenkins.ubuntu.com/job/mir-ci/178/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/178/console

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3275
http://jenkins.qa.ubuntu.com/job/mir-ci/6149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5676
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/352/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/473
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/473
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/473/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5673
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8103
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/348
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/348/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/204/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27136

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6149/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Sounds like the right answer.

review: Approve

[Chris Halse Rogers (raof)]

I'm uncertain what this fixes? The previous version likewise failed the target when there was an _unreleased symbol?

Not technically correct; there's no guarantee that SYMVER is the 5th whitespace-separated field (indeed, the FLAGS field will almost always count as two different whitespace-separated fields)

EG:
  ADDRESS | FLAGS | SEC | SIZE | SYMVER | NAME
0000000000025810 g DF .text 00000000000003f8 MIR_CLIENT_9 mir_connect

Has it been tested that this actually picks up unreleased symbols? I did test the previous version, and it did fail as appropriate.

review: Needs Information

[Chris Halse Rogers (raof)]

Hah. Of course, ASCII formatting doesn't work on LP.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2375/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/207
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/207
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5689
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8116
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27165

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> I'm uncertain what this fixes? The previous version likewise failed the target
> when there was an _unreleased symbol?

It looks like that is the intent; but, empirically, it doesn't.

review: Approve

[Alberto Aguirre (albaguirre)]

> I'm uncertain what this fixes? The previous version likewise failed the target
> when there was an _unreleased symbol?

It did not (at least on my xenial machine). We noticed this during the 0.19 release where the target succeeded even when there were unreleased symbols present.

> Not technically correct; there's no guarantee that SYMVER is the 5th
> whitespace-separated field (indeed, the FLAGS field will almost always count
> as two different whitespace-separated fields)
>
> EG:
> ADDRESS | FLAGS | SEC | SIZE | SYMVER | NAME
> 0000000000025810 g DF .text 00000000000003f8 MIR_CLIENT_9 mir_connect
>

True, I've corrected this.

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

PASSED: Continuous integration, rev:3277
https://mir-jenkins.ubuntu.com/job/mir-ci/203/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/204/console

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3277
http://jenkins.qa.ubuntu.com/job/mir-ci/6179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/503
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/503
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5713
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8129
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/363
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/219
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27218

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/6179/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4676
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5725/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/215
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/215
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5722
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5722/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8135/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27224

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-29 08:18:22 +0000
+++ CMakeLists.txt	2016-02-01 18:18:23 +0000
@@ -262,6 +262,7 @@
 add_custom_target(release-checks)
 
 mir_check_no_unreleased_symbols(mirclient release-checks)
+mir_check_no_unreleased_symbols(mircommon release-checks)
 mir_check_no_unreleased_symbols(mircookie release-checks)
 mir_check_no_unreleased_symbols(mirplatform release-checks)
 mir_check_no_unreleased_symbols(mirprotobuf release-checks)

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2016-01-29 08:18:22 +0000
+++ cmake/MirCommon.cmake	2016-02-01 18:18:23 +0000
@@ -235,23 +235,21 @@
   set(TARGET_NAME "Checking-${TARGET}-for-unreleased-symbols")
   add_custom_target(
     ${TARGET_NAME}
-    # Some sort of documentation for this awk monstrosity:
+    # Some sort of documentation for this monstrosity:
     #
     # Objdump format is:
     #
     # $ADDRESS $FLAGS $SECTION $SIZE $SYMVER $NAME
     #
-    # Sadly, $FLAGS is fixed-width but contains 1 or more fields separated by whitespace,
-    # but the rest of the fields are *not* fixed witdth.
-    #
-    # So:
-    #
-    # We look only at the lines which start with a digit; these are the lines containing symbols.
-    # Then, we loop through the fields until we find one matching exactly "D."; this will be the $FLAGS
-    # section with D(ynamic symbol) then some other modifier.
-    # Then we check that the next field ($SECTION) is not *UND* (ie: this symbol is defined in this DSO).
-    # *Then* we check that the $SYMVER field does not match "unreleased"
-    COMMAND /bin/sh -c "objdump -T $<TARGET_FILE:${TARGET}> | awk '/^[[:digit:]]+.*/ { for (i = 2 ; i <= NF ; i++) { if ($i ~ \"^D.\$\") { i++ ; if (\$i != \"*UND*\") { i = i+2 ; if (\$i ~ \"unreleased\") { print ; exit 1}}}}}'"
+    # Cut first five lines which don't contain any symbol information
+    # Cut any lines for undefined symbols
+    # Cut adress and flags which are fixed width
+    # Convert tabs to spaces
+    # Whitespace between fields is collapsed to one character
+    # Extract the symbol version (3rd field)
+    # Check for unreleased symbols - grep will set exit code to 0 if any are found
+    # finally invert the exit code
+    COMMAND /bin/sh -c "objdump -T $<TARGET_FILE:${TARGET}> | tail -n+5 | grep -v 'UND' | cut -c 26- | sed $'s/\t/ /g' | tr -s ' ' | cut -d ' ' -f 3 | grep -q unreleased ; test $? -gt 0"
     VERBATIM
   )
   add_dependencies(${DEPENDENT_TARGET} ${TARGET_NAME})