diff options
| author | schmonz <schmonz@pkgsrc.org> | 2013-03-26 15:11:36 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2013-03-26 15:11:36 +0000 |
| commit | aa0977e814844ebd78a139497decc61950c7d92a (patch) | |
| tree | dcee18fed6ae92754320a16d94e5543221504bb7 /pkgtools | |
| parent | 69d0d7df9eb812d8ae5f531bb0dba9c2df725753 (diff) | |
| download | pkgsrc-aa0977e814844ebd78a139497decc61950c7d92a.tar.gz | |
Respond to wiz's code review:
* In test, match the "make makesum" warning more loosely.
* In test, find packages to run against in $PKGSRCDIR explicitly.
* Bump version.
This is the last commit in a set developed for my "Rehabilitating
pkglint" talk at pkgsrcCon 2013.
Reviewed-at-pkgsrcCon-and-approved-during-the-freeze-by: wiz
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.t | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 1587a09a72f..a00f0eb5772 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.427 2013/03/26 15:10:31 schmonz Exp $ +# $NetBSD: Makefile,v 1.428 2013/03/26 15:11:36 schmonz Exp $ # Note: if you update the version number, please have a look at the # changes between the CVS tag "pkglint_current" and HEAD. # After updating, please re-set the CVS tag to HEAD. -DISTNAME= pkglint-4.127 +DISTNAME= pkglint-4.128 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/pkglint.t b/pkgtools/pkglint/files/pkglint.t index fdeb03a64b4..841b38d096e 100644 --- a/pkgtools/pkglint/files/pkglint.t +++ b/pkgtools/pkglint/files/pkglint.t @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.t,v 1.8 2013/03/26 15:11:20 schmonz Exp $ +# $NetBSD: pkglint.t,v 1.9 2013/03/26 15:11:36 schmonz Exp $ # require 'pkglint.pl'; # so we can test its internals @@ -150,7 +150,7 @@ sub test_lint_some_reference_packages { my %reference_packages = ( 'mail/qmail-run' => { stdout_re => <<EOT, -^WARN: .*distinfo: File not found\. Please run '.+make makesum'\. +^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\"\. WARN: .*Makefile:[0-9]+: The LOCALBASE variable should not be used by packages\. @@ -183,7 +183,7 @@ EOT my $pkglint = "$dirprefix/pkglint.pl"; my $perl = $Config{perlpath}; for my $package (keys %reference_packages) { - test_program($perl, [ $pkglint, "../../../$package" ], + test_program($perl, [ $pkglint, "@PKGSRCDIR@/$package" ], $reference_packages{$package}->{exitcode}, $reference_packages{$package}->{stdout_re}, $reference_packages{$package}->{stderr_re}); |