Now that pkglint's Makefile defines its LICENSE, I would expect the

'..' test to print "looks fine." and exit 0. Indeed, this is what
an installed pkglint does when run in pkgtools/pkglint. But the
corresponding test does not, depending in some way on the state
left by previous tests of main().

In lieu of precise understanding, just run the adjusted '..' test
earlier so that nothing causes it to fail. This will annoy someone
later (probably me), but gets us back to green.

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgtools/pkglint/files/pkglint.t b/pkgtools/pkglint/files/pkglint.t
index 5ec24f42bb1..fb20587c308 100644
--- a/pkgtools/pkglint/files/pkglint.t
+++ b/pkgtools/pkglint/files/pkglint.t
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.t,v 1.11 2014/11/23 19:14:40 schmonz Exp $
+# $NetBSD: pkglint.t,v 1.12 2014/11/24 16:31:34 schmonz Exp $
 #
 
 require 'pkglint.pl';			# so we can test its internals
@@ -130,14 +130,14 @@ sub test_pkglint_main {
 	@ARGV = ('-h');
 	test_unit($unit, undef, 0, '^usage: pkglint ', '^$');
 
-	@ARGV = ();
-	test_unit($unit, undef, 1, '^ERROR:.+how to check', '^$');
+	@ARGV = ('..');
+	test_unit($unit, undef, 0, '^looks fine', '^$');
 
 	@ARGV = ('.');
 	test_unit($unit, undef, 1, '^ERROR:.+how to check', '^$');
 
-	@ARGV = ('..');
-	test_unit($unit, undef, 1, '^ERROR:.+LICENSE', '^$');
+	@ARGV = ();
+	test_unit($unit, undef, 1, '^ERROR:.+how to check', '^$');
 
 	@ARGV = ('/does/not/exist');
 	test_unit($unit, undef, 1, '^ERROR:.+not exist', '^$');