[libconfig-model-dpkg-perl] 09/11: fixed scna-copyright test

dod at debian.org dod at debian.org
Fri Jul 3 19:20:13 UTC 2015


This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit 4a0c43b5f2984e634a7ec88a3e9421b5d2828a57
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Jul 3 19:59:42 2015 +0200

    fixed scna-copyright test
    
    Gbp-Dch: Ignore
---
 t/scanner/examples/moarvm.in  | 58 +++++++++++++++++++++++++++++++++++++++++++
 t/scanner/examples/moarvm.out | 28 +++++++++++++--------
 t/scanner/examples/pan.in     |  7 ++++++
 t/scanner/examples/pan.out    | 12 ++++-----
 t/scanner/examples/sdl2.in    | 23 +++++++++++++++++
 t/scanner/examples/sdl2.out   | 38 ++++++----------------------
 t/scanner/scan-copyright.t    |  4 +++
 7 files changed, 123 insertions(+), 47 deletions(-)

diff --git a/t/scanner/examples/moarvm.in b/t/scanner/examples/moarvm.in
index 85b2299..3cabb2b 100644
--- a/t/scanner/examples/moarvm.in
+++ b/t/scanner/examples/moarvm.in
@@ -1036,3 +1036,61 @@
 ./tools/release.sh	UNKNOWN	*No copyright*
 ./tools/ucd2c.pl	UNKNOWN	*No copyright*
 ./tools/moar-gdb.py	UNKNOWN	*No copyright*
+./debian/README.source	UNKNOWN	*No copyright*
+./lib/README.md	GENERATED FILE	*No copyright*
+./docs/README.md	UNKNOWN	*No copyright*
+./build/README.md	UNKNOWN	*No copyright*
+./src/6model/reprs/README.md	UNKNOWN	*No copyright*
+./src/6model/README.md	UNKNOWN	*No copyright*
+./src/README.md	UNKNOWN	*No copyright*
+./ports/macports/README	UNKNOWN	*No copyright*
+./LICENSE	UNKNOWN	and License / 2012-2015 by Jonathan Worthington and others
+./3rdparty/libatomic_ops/doc/README.txt	UNKNOWN	*No copyright*
+./3rdparty/libatomic_ops/doc/README_win32.txt	UNKNOWN	*No copyright*
+./3rdparty/libatomic_ops/doc/README_malloc.txt	UNKNOWN	*No copyright*
+./3rdparty/libatomic_ops/doc/README_stack.txt	UNKNOWN	*No copyright*
+./3rdparty/libatomic_ops/src/atomic_ops/sysdeps/README	UNKNOWN	*No copyright*
+./3rdparty/libatomic_ops/COPYING	UNKNOWN	the software, and / 1989, 1991 Free Software Foundation, Inc
+./3rdparty/libatomic_ops/README	GENERATED FILE	*No copyright*
+./3rdparty/tinymt/LICENSE.txt	BSD (3 clause)	2011, 2013 Mutsuo Saito, Makoto Matsumoto
+./3rdparty/tinymt/README.txt	UNKNOWN	*No copyright*
+./3rdparty/libuv/samples/socks5-proxy/LICENSE	BSD (3 clause) MIT/X11 (BSD like)	StrongLoop, Inc. All rights reserved / 1987, 1993, 1994
+./3rdparty/libuv/LICENSE	MIT/X11 (BSD like)	the Internet Systems Consortium, Inc., and licensed under the ISC / Niels Provos. Two clause BSD license / Joyent, Inc. and other Node contributors. All rights reserved / Google Inc. and Sony Mobile / Berkeley Software Design / Alexander Chemeris. Three
+./3rdparty/libuv/README.md	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.embedded	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.Minix	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.Windows	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.Generic	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.SunOS	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.iOS	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.CMake	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.NDS	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.MacOSX	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README.PSP	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/README-Cross.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/doc/License.txt	ISC	2007-2012 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/autovar/LICENSE.txt	ISC	2011 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/autovar/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/dynload/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/dyncall/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/dyncall/README-Developer.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/dyncallback/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/portasm/README.txt	UNKNOWN	2011 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/buildsys/lua/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/LICENSE	ISC	2007-2015 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/hacking-arm-thumb-interwork/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/test/suite_floats/README.txt	ISC	2007-2010 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/suite/README.txt	ISC	2007-2009 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/resolve_self/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/test/suite_x86win32std/README.txt	ISC	2007-2009 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/callback_suite/README.txt	GENERATED FILE	*No copyright*
+./3rdparty/dyncall/test/arm-thumb-interwork/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/test/hacking-mips/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/test/ellipsis/README.txt	ISC	2007-2009 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/suite3/README.txt	ISC	2007-2009 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/suite_x86win32fast/README.txt	ISC	2007-2009 Daniel Adler <dadler at uni-goettingen.de>
+./3rdparty/dyncall/test/call_suite/README.txt	UNKNOWN	*No copyright*
+./3rdparty/dyncall/README	UNKNOWN	*No copyright*
+./3rdparty/libtommath/LICENSE	WTFPL	2004 Sam Hocevar <sam at hocevar.net>
+./3rdparty/README.md	UNKNOWN	*No copyright*
+./README.markdown	UNKNOWN	*No copyright*
diff --git a/t/scanner/examples/moarvm.out b/t/scanner/examples/moarvm.out
index ca17cbd..b3fe894 100644
--- a/t/scanner/examples/moarvm.out
+++ b/t/scanner/examples/moarvm.out
@@ -1,4 +1,4 @@
-Files: 3rdparty/dynasm/*
+Files: *
 Copyright: 2005-2014, Mike Pall.
 License: UNKNOWN
 
@@ -40,17 +40,17 @@ Files: 3rdparty/dyncall/dynload/dynload_darwin.c
 Copyright: 2007-2011, Olivier Chafik <olivier.chafik at gmail.com>
 License: ISC
 
-Files: 3rdparty/dyncall/test/hacking-arm-thumb-interwork/diff-gcc-defs/empty.c
-Copyright: 2007-2015, Daniel Adler <dadler at uni-goettingen.de>
-License: ISC
+Files: 3rdparty/dyncall/portasm/*
+Copyright: 2011, Daniel Adler <dadler at uni-goettingen.de>
+License: UNKNOWN
 
 Files: 3rdparty/dyncall/test/plain/test_structs.c
 Copyright: 2007-2011, Olivier Chafik <olivier.chafik at gmail.com>
 License: ISC
 
-Files: 3rdparty/dyncall/test/samples/calls/*
-Copyright: 2007-2015, Daniel Adler <dadler at uni-goettingen.de>
-License: ISC
+Files: 3rdparty/libatomic_ops/*
+Copyright: the software, and / 1989, 1991 Free Software Foundation, Inc
+License: UNKNOWN
 
 Files: 3rdparty/libatomic_ops/src/*
 Copyright: 2003-2011, Hewlett-Packard Development Company, L.P
@@ -122,6 +122,10 @@ Files: 3rdparty/libatomic_ops/src/atomic_ops/sysdeps/sunc/sparc.h
 Copyright: 2003-2011, Hewlett-Packard Development Company, L.P
 License: Expat
 
+Files: 3rdparty/libtommath/*
+Copyright: 2004, Sam Hocevar <sam at hocevar.net>
+License: WTFPL
+
 Files: 3rdparty/libuv/*
 Copyright: Joyent, Inc. and other Node contributors.
 License: Expat
@@ -190,6 +194,10 @@ Files: 3rdparty/msinttypes/*
 Copyright: 2006-2013, Alexander Chemeris
 License: BSD-3-clause
 
+Files: 3rdparty/tinymt/*
+Copyright: 2011, 2013, Mutsuo Saito, Makoto Matsumoto
+License: BSD-3-clause
+
 Files: 3rdparty/tinymt/tinymt64.c
 Copyright: 2011, Mutsuo Saito, Makoto Matsumoto
 License: UNKNOWN
@@ -198,15 +206,15 @@ Files: 3rdparty/uthash.h
 Copyright: 2003-2014, Troy D. Hanson http://troydhanson.github.com/uthash
 License: BSD-2-clause
 
-Files: src/gc/debug.h
+Files: src/*
 Copyright: >= (char *)tc->nursery_fromspace && \ / < (char *)tc->nursery_fromspace + MVM_NURSERY_SIZE) \
 License: UNKNOWN
 
-Files: src/io/dirops.c
+Files: src/io/*
 Copyright: ( == L\\ || == L/) / ( == /) / ( != L\\ && != L/) / ( != /)
 License: UNKNOWN
 
-Files: src/strings/unicode_db.c
+Files: src/strings/*
 Copyright: there is clear notice in each / ?1991-2012, Unicode, Inc. Distributed
 License: UNKNOWN
 
diff --git a/t/scanner/examples/pan.in b/t/scanner/examples/pan.in
index 0e0de51..68a515d 100644
--- a/t/scanner/examples/pan.in
+++ b/t/scanner/examples/pan.in
@@ -228,3 +228,10 @@
 ./pan/gui/group-prefs.cc	GPL (v2) (with incorrect FSF address)	2002-2006 Charles Kerr <charles at rebelbase.com>
 ./pan/gui/task-pane.cc	GPL (v2) (with incorrect FSF address)	2002-2006 Charles Kerr <charles at rebelbase.com>
 ./pan/gui/pan.ui.ssl.h	UNKNOWN	*No copyright*
+./debian/README.Debian	UNKNOWN	*No copyright*
+./README.windows.in	UNKNOWN	*No copyright*
+./README.mingw	UNKNOWN	*No copyright*
+./README.windows	UNKNOWN	*No copyright*
+./pan/gui/license.h	UNKNOWN	the software, and\n\ / 1989, 1991 Free Software Foundation, Inc.\n\
+./COPYING	UNKNOWN	the software, and / 1989, 1991 Free Software Foundation, Inc
+./README	UNKNOWN	*No copyright*
diff --git a/t/scanner/examples/pan.out b/t/scanner/examples/pan.out
index cc7d5f9..5e8b417 100644
--- a/t/scanner/examples/pan.out
+++ b/t/scanner/examples/pan.out
@@ -1,6 +1,6 @@
 Files: *
-Copyright: 1994-2001, Frank Pilhofer. The author may
-License: GPL-2+
+Copyright: the software, and / 1989, 1991 Free Software Foundation, Inc
+License: UNKNOWN
 
 Files: pan/*
 Copyright: 2002-2007, Charles Kerr <charles at rebelbase.com>
@@ -50,10 +50,6 @@ Files: pan/gui/e-charset-dialog.c
 Copyright: 2001, Ximian, Inc
 License: GPL-2
 
-Files: pan/gui/license.h
-Copyright: the software, and\n\ / 1989, 1991 Free Software Foundation, Inc.\n\
-License: UNKNOWN
-
 Files: pan/gui/xface.c
 Copyright: messages are not removed, and no monies are exchanged / James Ashton - Sydney University - June 1990
 License: UNKNOWN
@@ -99,6 +95,10 @@ Copyright: 2011, Heinrich Müller <henmull at src.gnome.org>
  2002, vjt (irssi project)
 License: GPL-2
 
+Files: uulib/*
+Copyright: 1994-2001, Frank Pilhofer. The author may
+License: GPL-2+
+
 Files: uulib/crc32.c
 Copyright: 1995-2005, Mark Adler
 License: Zlib
diff --git a/t/scanner/examples/sdl2.in b/t/scanner/examples/sdl2.in
index 5893fa0..b05031a 100644
--- a/t/scanner/examples/sdl2.in
+++ b/t/scanner/examples/sdl2.in
@@ -664,3 +664,26 @@
 ./build-scripts/ltmain.sh	GPL (v2 or later)	1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
 ./build-scripts/iosbuild.sh	UNKNOWN	*No copyright*
 ./build-scripts/g++-fat.sh	UNKNOWN	*No copyright*
+./include/SDL_copying.h	zlib/libpng	1997-2014 Sam Lantinga <slouken at libsdl.org>
+./README-macosx.txt	UNKNOWN	*No copyright*
+./README-hg.txt	UNKNOWN	*No copyright*
+./README-cmake.txt	UNKNOWN	*No copyright*
+./README-ios.txt	UNKNOWN	*No copyright*
+./README.txt	UNKNOWN	*No copyright*
+./README-pandora.txt	UNKNOWN	*No copyright*
+./README-wince.txt	UNKNOWN	*No copyright*
+./README-linux.txt	UNKNOWN	*No copyright*
+./README-touch.txt	UNKNOWN	*No copyright*
+./README-gesture.txt	UNKNOWN	*No copyright*
+./README-android.txt	UNKNOWN	*No copyright*
+./README-porting.txt	UNKNOWN	*No copyright*
+./README-directfb.txt	UNKNOWN	*No copyright*
+./test/COPYING	UNKNOWN	*No copyright*
+./test/README	UNKNOWN	*No copyright*
+./COPYING.txt	zlib/libpng	1997-2014 Sam Lantinga <slouken at libsdl.org>
+./README-raspberrypi.txt	UNKNOWN	*No copyright*
+./README-dynapi.txt	UNKNOWN	*No copyright*
+./README-psp.txt	UNKNOWN	*No copyright*
+./README-platforms.txt	UNKNOWN	*No copyright*
+./README-windows.txt	UNKNOWN	*No copyright*
+./README-SDL.txt	UNKNOWN	*No copyright*
diff --git a/t/scanner/examples/sdl2.out b/t/scanner/examples/sdl2.out
index 116fd44..ec64af8 100644
--- a/t/scanner/examples/sdl2.out
+++ b/t/scanner/examples/sdl2.out
@@ -1,25 +1,17 @@
-Files: build-scripts/ltmain.sh
-Copyright: 1996-2001, 2003-2006, 
-License: GPL-2+
-
-Files: include/*
+Files: *
 Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
 License: Zlib
 
+Files: build-scripts/*
+Copyright: 1996-2001, 2003-2006, 
+License: GPL-2+
+
 Files: include/SDL_egl.h
  include/SDL_opengles2.h
 Copyright: 2008, 2009, The Khronos Group Inc
  1997-2014, Sam Lantinga <slouken at libsdl.org>
 License: Zlib or Expat
 
-Files: src/*
-Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: Zlib
-
-Files: src/file/SDL_rwops.c
-Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: Zlib
-
 Files: src/libm/*
 Copyright: 1993, Sun Microsystems, Inc.
 License: UNKNOWN
@@ -28,24 +20,12 @@ Files: src/libm/math_libm.h
 Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
 License: Zlib
 
-Files: src/main/haiku/*
-Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: Zlib
-
-Files: src/main/psp/*
-Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: Zlib
-
 Files: src/render/SDL_yuv_sw.c
 Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
  1995, The Regents of the University of California
  1995, Erik Corry
 License: Zlib
 
-Files: src/render/opengles/SDL_render_gles.c
-Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: Zlib
-
 Files: src/render/software/SDL_rotate.c
 Copyright: follows: / 2001-2011, Andreas Schiffler
 License: Zlib
@@ -77,12 +57,8 @@ Copyright: 1997-2014, Sam Lantinga <slouken at libsdl.org>
 License: UNKNOWN
 
 Files: test/testhaptic.c
-Copyright: 2008, Edgar Simo Serra
- 1997-2014, Sam Lantinga <slouken at libsdl.org>
-License: BSD-3-clause
-
-Files: test/testrumble.c
-Copyright: 2011, Edgar Simo Serra
+ test/testrumble.c
+Copyright: 2008, 2011, Edgar Simo Serra
  1997-2014, Sam Lantinga <slouken at libsdl.org>
 License: BSD-3-clause
 
diff --git a/t/scanner/scan-copyright.t b/t/scanner/scan-copyright.t
index 16f5fd5..2367bd1 100644
--- a/t/scanner/scan-copyright.t
+++ b/t/scanner/scan-copyright.t
@@ -9,6 +9,10 @@ use Test::File::Contents;
 
 use Dpkg::Copyright::Scanner;
 
+# *.out files in examples can be regenerated with a command like:
+# COPYRIGHT_SCANNER_INPUT=t/scanner/examples/moarvm.in perl -Ilib bin/scan-copyrights > t/scanner/examples/moarvm.out
+# be sure to check that the updated output make sense
+
 # global tests
 my $dir = path('t/scanner/examples/') ;
 my $temp = Path::Tiny->tempfile ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git



More information about the Pkg-perl-cvs-commits mailing list