Merge lp:~michihenning/persistent-cache-cpp/fix-copyright-xenial into lp:persistent-cache-cpp/devel

[Michi Henning]

Work-around for broken licensecheck on xenial.

Work-around for broken licensecheck on xenial.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-devel-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-devel-xenial-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-devel-xenial-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-devel-xenial-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/persistent-cache-cpp-devel-xenial-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/persistent-cache-cpp-devel-ci/28/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

This change disables the test entirely. Would it be possible to get it to always run the test but ignore the result on Xenial (similar to how we've ignored errors in tests on PPC/s390, but still run them).

[Michi Henning (michihenning)]

We could do that, but we'd get many hundreds of errors in the log.

I have this on my todo list anyway. It affects this project, thumbnailer, unity-api, and unity-scopes-api, so it needs doing. All these projects have disabled the test the same way as here, so I'm a bit reluctant to make a change only here, seeing that it's a temporary work-around for the failure anyway.

Note that we won't accidentally release with missing copyright headers because that is tested separately by the build machinery.

I added a unit test for this originally mainly so we wouldn't only find out on Jenkins or in a silo when there was a problem with a copyright header.

[James Henstridge (jamesh)]

Fair enough then.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-08-07 10:58:11 +0000
+++ debian/control	2015-12-10 05:32:25 +0000
@@ -4,10 +4,12 @@
 Build-Depends: cmake,
                cmake-extras (>= 0.4),
                debhelper (>= 9),
+               devscripts,
                doxygen,
                libboost-filesystem-dev,
                libgtest-dev,
                libleveldb-dev,
+               lsb-release,
                pkg-config,
                python3,
 Standards-Version: 3.9.6

=== modified file 'tests/copyright/check_copyright.sh'
--- tests/copyright/check_copyright.sh	2015-07-21 06:22:48 +0000
+++ tests/copyright/check_copyright.sh	2015-12-10 05:32:25 +0000
@@ -17,9 +17,7 @@
 # Authored by: Michi Henning <[e-mail]>
 
 #
-# Check that, somewhere in the first 30 lines of each file, the string "Copyright" (case independent) appears.
-# Print out a messsage for each file without a copyright notice and exit with non-zero status
-# if any such file is found.
+# Check that we have acceptable license information in our source files.
 #
 
 usage()
@@ -31,6 +29,12 @@
 [ $# -lt 1 ] && usage
 [ $# -gt 2 ] && usage
 
+# TODO: Temporary hack to work around broken licensecheck on xenial. Remove this once that is fixed.
+distro=$(lsb_release -c -s)
+[ "$distro" = "xenial" ] && {
+    exit 0
+}
+
 ignore_pat="\\.sci$"
 
 #