diff options
| author | rillig <rillig@pkgsrc.org> | 2018-08-09 20:21:42 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2018-08-09 20:21:42 +0000 |
| commit | 60004107551d35c2ea36627f44cf5b37ea7ee21c (patch) | |
| tree | 1eafa6a350a9a7493aad4698228d4bb38ab7c9df /pkgtools/pkglint/files | |
| parent | 8b22d216e2b45880f6f80d135cec351a54bf2c22 (diff) | |
| download | pkgsrc-60004107551d35c2ea36627f44cf5b37ea7ee21c.tar.gz | |
pkgtools/pkglint: make the tests run cleanly
Diffstat (limited to 'pkgtools/pkglint/files')
| -rw-r--r-- | pkgtools/pkglint/files/buildlink3.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/category.go | 2 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/package_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/buildlink3.go b/pkgtools/pkglint/files/buildlink3.go index 0fbf57a1bb6..7def94b24e4 100644 --- a/pkgtools/pkglint/files/buildlink3.go +++ b/pkgtools/pkglint/files/buildlink3.go @@ -13,7 +13,7 @@ func ChecklinesBuildlink3Mk(mklines *MkLines) { mklines.Check() - exp := NewExpecter(mklines.lines) + exp := NewMkExpecter(mklines) for exp.AdvanceIfPrefix("#") { line := exp.PreviousLine() diff --git a/pkgtools/pkglint/files/category.go b/pkgtools/pkglint/files/category.go index 05a27c1da65..34af8dc8a29 100644 --- a/pkgtools/pkglint/files/category.go +++ b/pkgtools/pkglint/files/category.go @@ -18,7 +18,7 @@ func CheckdirCategory() { mklines := NewMkLines(lines) mklines.Check() - exp := NewExpecter(lines) + exp := NewMkExpecter(mklines) for exp.AdvanceIfPrefix("#") { } exp.ExpectEmptyLine(G.opts.WarnSpace) diff --git a/pkgtools/pkglint/files/package_test.go b/pkgtools/pkglint/files/package_test.go index 33ca7f13405..64abc7d3255 100644 --- a/pkgtools/pkglint/files/package_test.go +++ b/pkgtools/pkglint/files/package_test.go @@ -515,7 +515,7 @@ func (s *Suite) Test_Package_includeAfterExists(c *check.C) { 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.", |