This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository devscripts.
commit f0b474e7a0020d90cceeed448c095137f16dfab3 Author: Dominique Dumont <[email protected]> Date: Thu May 14 15:58:16 2015 +0200 test licensescheck with different encodings --- scripts/licensecheck.pl | 1 + test/licensecheck/copr-iso8859.h | 18 ++++++++++++++++++ test/licensecheck/copr-utf8.h | 20 ++++++++++++++++++++ test/test_licensecheck | 4 ++++ 4 files changed, 43 insertions(+) diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index 5672c8d..b7b24e7 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -375,6 +375,7 @@ sub parse_copyright { $match =~ s/^\s+//; $match =~ s/\s{2,}/ /g; $match =~ s/\\@/@/g; + $match =~ s/\s*\*\s*$//; $copyright = $match; } } diff --git a/test/licensecheck/copr-iso8859.h b/test/licensecheck/copr-iso8859.h new file mode 100644 index 0000000..09c9a5a --- /dev/null +++ b/test/licensecheck/copr-iso8859.h @@ -0,0 +1,18 @@ +/* + * This file + * Copyright (C) 2011 Heinrich M�ller <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + diff --git a/test/licensecheck/copr-utf8.h b/test/licensecheck/copr-utf8.h new file mode 100644 index 0000000..fb9128c --- /dev/null +++ b/test/licensecheck/copr-utf8.h @@ -0,0 +1,20 @@ +/******************************************************************************* + * superduper - main.h * + * Copyright (C) 2001-2010 Paul 'bar' Stevénsön * + * Copyright (C) 2004-2015 Oliva 'f00' Oberto * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * + ******************************************************************************/ diff --git a/test/test_licensecheck b/test/test_licensecheck index 6ed925e..568d52a 100755 --- a/test/test_licensecheck +++ b/test/test_licensecheck @@ -100,4 +100,8 @@ testRegexpKiller() { license "regexp-killer.c" "UNKNOWN" } +testEncoding () { + license2 "-m --copyright" "copr-iso8859.h" "GPL (v2) (with incorrect FSF address) 2011 Heinrich Müller <[email protected]>" + license2 "-m --copyright" "copr-utf8.h" "GPL (v2 or later) 2004-2015 Oliva 'f00' Oberto / 2001-2010 Paul 'bar' Stevénsön" +} . shunit2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
