Unity API

Merge lp:~michihenning/unity-api/licensecheck into lp:unity-api

licensecheck
Merge into trunk

Proposed by Michi Henning on 2016-03-31

Status:

Merged

Approved by:

Marcus Tomlinson on 2016-04-12

Approved revision:

223

Merged at revision:

233

Proposed branch:

lp:~michihenning/unity-api/licensecheck

Merge into:

lp:unity-api

Diff against target:

41 lines (+17/-6)

2 files modified

test/copyright/check_copyright.sh (+1/-6)
test/qmltest/modules/TestUtil/Verifier.qml (+16/-0)

To merge this branch:

bzr merge lp:~michihenning/unity-api/licensecheck

Related bugs:

Bug #1194867: Mix of licenses in source

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-04-07
Marcus Tomlinson (community)		2016-03-31	Approve on 2016-03-31
Review via email: mp+290564@code.launchpad.net

Commit message

Re-enabled license/copyright test for xenial.

Description of the change

Re-enabled license/copyright test for xenial.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/63/rebuild

review: Approve (continuous-integration)

Revision history for this message

Marcus Tomlinson (marcustomlinson) wrote on 2016-03-31:

LGTM

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/66/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michi Henning

Unity Team

 === modified file 'test/copyright/check_copyright.sh'
 --- test/copyright/check_copyright.sh	2015-11-24 10:27:28 +0000
 +++ test/copyright/check_copyright.sh	2016-04-07 03:23:09 +0000
@@ -34,12 +34,7 @@
  [ $# -gt 2 ] && usage
--# TODO: Temporary hack to work around broken licensecheck on xenial (see LP #1519292).
--# Remove this once that is fixed.
--distro=$(lsb_release -c -s)
--[ "$distro" = "xenial" ] && exit 0
--
--ignore_pat="\\.sci$|CMakeFiles"
++ignore_pat="\\.sci$|\\.bzr|\\.txt$|CMakeFiles|debian|qmldir|valgrind-suppress|astyle-config|\\.cmake$|\\.ini$|\\.in$"
+ #
  # We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories
 === modified file 'test/qmltest/modules/TestUtil/Verifier.qml'
 --- test/qmltest/modules/TestUtil/Verifier.qml	2014-09-09 15:20:52 +0000
 +++ test/qmltest/modules/TestUtil/Verifier.qml	2016-04-07 03:23:09 +0000
@@ -1,3 +1,19 @@
++/*
++ * Copyright (C) 2012, 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
  import QtQuick 2.0
  import QtTest 1.0
  import TestUtil 0.1