[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint pkgtools/pkglint: make the tests run ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94b326a0c65e
branches:  trunk
changeset: 311403:94b326a0c65e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Aug 09 20:21:42 2018 +0000

description:
pkgtools/pkglint: make the tests run cleanly

diffstat:

 pkgtools/pkglint/Makefile              |  4 ++--
 pkgtools/pkglint/files/buildlink3.go   |  2 +-
 pkgtools/pkglint/files/category.go     |  2 +-
 pkgtools/pkglint/files/package_test.go |  2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 57cb278ab122 -r 94b326a0c65e pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Aug 09 20:12:15 2018 +0000
+++ b/pkgtools/pkglint/Makefile Thu Aug 09 20:21:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.544 2018/08/09 20:08:12 rillig Exp $
+# $NetBSD: Makefile,v 1.545 2018/08/09 20:21:42 rillig Exp $
 
 PKGNAME=       pkglint-5.5.16
 DISTFILES=     # none
@@ -22,7 +22,7 @@
 SUBST_STAGE.pkglint=   post-configure
 SUBST_FILES.pkglint+=  pkglint.go
 SUBST_SED.pkglint+=    -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
-SUBST_SED.pkglint+=    -e s\|@BMAKE@\|${MAKE:Q}\|g
+SUBST_SED.pkglint+=    -e s\|@BMAKE@\|${MAKE:T:Q}\|g
 
 do-extract:
        ${RUN} ${MKDIR} ${WRKDIR}/pkglint
diff -r 57cb278ab122 -r 94b326a0c65e pkgtools/pkglint/files/buildlink3.go
--- a/pkgtools/pkglint/files/buildlink3.go      Thu Aug 09 20:12:15 2018 +0000
+++ b/pkgtools/pkglint/files/buildlink3.go      Thu Aug 09 20:21:42 2018 +0000
@@ -13,7 +13,7 @@
 
        mklines.Check()
 
-       exp := NewExpecter(mklines.lines)
+       exp := NewMkExpecter(mklines)
 
        for exp.AdvanceIfPrefix("#") {
                line := exp.PreviousLine()
diff -r 57cb278ab122 -r 94b326a0c65e pkgtools/pkglint/files/category.go
--- a/pkgtools/pkglint/files/category.go        Thu Aug 09 20:12:15 2018 +0000
+++ b/pkgtools/pkglint/files/category.go        Thu Aug 09 20:21:42 2018 +0000
@@ -18,7 +18,7 @@
        mklines := NewMkLines(lines)
        mklines.Check()
 
-       exp := NewExpecter(lines)
+       exp := NewMkExpecter(mklines)
        for exp.AdvanceIfPrefix("#") {
        }
        exp.ExpectEmptyLine(G.opts.WarnSpace)
diff -r 57cb278ab122 -r 94b326a0c65e pkgtools/pkglint/files/package_test.go
--- a/pkgtools/pkglint/files/package_test.go    Thu Aug 09 20:12:15 2018 +0000
+++ b/pkgtools/pkglint/files/package_test.go    Thu Aug 09 20:21:42 2018 +0000
@@ -515,7 +515,7 @@
 
        t.CheckOutputLines(
                "WARN: ~/category/package/Makefile: Neither PLIST nor PLIST.common exist, and PLIST_SRC is unset.",
-               "WARN: ~/category/package/distinfo: File not found. Please run \"@BMAKE@ makesum\" or define NO_CHECKSUM=yes in the package Makefile.",
+               "WARN: ~/category/package/distinfo: File not found. Please run \""+confMake+" makesum\" or define NO_CHECKSUM=yes in the package Makefile.",
                "ERROR: ~/category/package/Makefile: Each package must define its LICENSE.",
                "WARN: ~/category/package/Makefile: No COMMENT given.",
                "ERROR: ~/category/package/Makefile:4: \"options.mk\" does not exist.",