summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorschmonz <schmonz>2014-11-23 19:14:40 +0000
committerschmonz <schmonz>2014-11-23 19:14:40 +0000
commit5ab1d6078d644a4ab6c0e65dc271cefee6d206f0 (patch)
treee705a1aea4fa5b47dd15cb1fa35f3af9c14dfa99 /pkgtools
parenta05a20abc806f1daa2d726c9b4acbd188ed6a2af (diff)
downloadpkgsrc-5ab1d6078d644a4ab6c0e65dc271cefee6d206f0.tar.gz
Catch up tests to code:
- PythonDependency is a basic vartype - Wording for missing LICENSE has changed (plural -> singular) - Unknown dependency pattern is now ERROR (used to be WARN) - qmail package behavior has been improved a bit (surprise!)
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.t16
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgtools/pkglint/files/pkglint.t b/pkgtools/pkglint/files/pkglint.t
index ba3fe8a8a33..5ec24f42bb1 100644
--- a/pkgtools/pkglint/files/pkglint.t
+++ b/pkgtools/pkglint/files/pkglint.t
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.t,v 1.10 2014/10/09 13:54:47 wiz Exp $
+# $NetBSD: pkglint.t,v 1.11 2014/11/23 19:14:40 schmonz Exp $
#
require 'pkglint.pl'; # so we can test its internals
@@ -81,7 +81,7 @@ sub test_get_vartypes_basictypes {
Pathlist Pathmask Pathname
Perl5Packlist
PkgName PkgOptionsVar PkgPath PkgRevision
- PlatformTriple PrefixPathname
+ PlatformTriple PrefixPathname PythonDependency
RelativePkgDir RelativePkgPath
Restricted
SedCommand SedCommands
@@ -151,11 +151,11 @@ sub test_lint_some_reference_packages {
'mail/qmail-run' => {
stdout_re => <<EOT,
^WARN: .*distinfo: File not found\. Please run '.*make makesum'\.
-ERROR: .*Makefile: All packages must define their LICENSE\.
-WARN: .*Makefile:[0-9]+: Unknown dependency pattern \"qmail-qfilter-1\.5nb1\"\.
+ERROR: .*Makefile: Each package must define its LICENSE\.
+ERROR: .*Makefile:[0-9]+: Unknown dependency pattern \"qmail-qfilter-1\.5nb1\"\.
WARN: .*Makefile:[0-9]+: The LOCALBASE variable should not be used by packages\.
WARN: .*Makefile:[0-9]+: The LOCALBASE variable should not be used by packages\.
-1 errors and 4 warnings found\..*\$
+2 errors and 3 warnings found\..*\$
EOT
stderr_re => undef,
exitcode => 1,
@@ -163,12 +163,10 @@ EOT
'mail/qmail' => {
stdout_re => <<EOT,
^WARN: .*Makefile:[0-9]+: USERGROUP_PHASE is defined but not used\. Spelling mistake\\?
-ERROR: .*patches/patch-hier\.c:[0-9]+: Comment expected\.
-ERROR: .*patches/patch-spawn\.c:[0-9]+: Comment expected\.
-2 errors and 1 warnings found\..*\$
+0 errors and 1 warnings found\..*\$
EOT
stderr_re => undef,
- exitcode => 1,
+ exitcode => 0,
},
'mail/getmail' => {
stdout_re => <<EOT,