diff options
| author | rillig <rillig@pkgsrc.org> | 2020-05-23 22:18:10 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-05-23 22:18:10 +0000 |
| commit | e565950ee7cf8ab4e850dd2b4c673771cb8d5b27 (patch) | |
| tree | b9008fdfa011064a468bb5758b7fd0fef3895e89 /pkgtools | |
| parent | e085a5e20336c14df9af11fa2f0b07a2f5e4f814 (diff) | |
| download | pkgsrc-e565950ee7cf8ab4e850dd2b4c673771cb8d5b27.tar.gz | |
pkgtools/check-portability: update to 20.1.1
Changes since 20.1.0:
Fixed off-by-one error in diagnostic for test ==.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/check-portability/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/check-portability/files/check-portability.c | 4 | ||||
| -rw-r--r-- | pkgtools/check-portability/files/testdata/zzz_expected | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgtools/check-portability/Makefile b/pkgtools/check-portability/Makefile index 1b7069289e3..0339577e0a9 100644 --- a/pkgtools/check-portability/Makefile +++ b/pkgtools/check-portability/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2020/04/19 12:05:14 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2020/05/23 22:18:10 rillig Exp $ -PKGNAME= check-portability-20.1.0 +PKGNAME= check-portability-20.1.1 CATEGORIES= pkgtools DISTFILES= # none diff --git a/pkgtools/check-portability/files/check-portability.c b/pkgtools/check-portability/files/check-portability.c index 2dc88c0e3d1..e0387232029 100644 --- a/pkgtools/check-portability/files/check-portability.c +++ b/pkgtools/check-portability/files/check-portability.c @@ -1,4 +1,4 @@ -/* $NetBSD: check-portability.c,v 1.15 2020/05/23 22:12:31 rillig Exp $ */ +/* $NetBSD: check-portability.c,v 1.16 2020/05/23 22:18:11 rillig Exp $ */ /* Copyright (c) 2020 Roland Illig @@ -401,7 +401,7 @@ checkline_sh_test_eqeq_error( { printf( "%s:%zu:%zu: found test ... == ...: %s\n", - cstr_charptr(filename), lineno, column, cstr_charptr(line)); + cstr_charptr(filename), lineno, column + 1, cstr_charptr(line)); nerrors++; explain( W_test_eqeq, diff --git a/pkgtools/check-portability/files/testdata/zzz_expected b/pkgtools/check-portability/files/testdata/zzz_expected index a342f2f02a3..38d15d5b285 100644 --- a/pkgtools/check-portability/files/testdata/zzz_expected +++ b/pkgtools/check-portability/files/testdata/zzz_expected @@ -23,7 +23,7 @@ files/testdata/Makefile.am:8:5: double brackets: if [[ ${COND} ]] || [[ $(COND) files/testdata/double-brackets:8:4: double brackets: if [[ test ]]; then files/testdata/double-brackets:10:1: double brackets: [[ test ]] files/testdata/double-brackets:12:1: double brackets: [[ test ]] || echo -files/testdata/env-sh:8:4: found test ... == ...: [ a == b ] +files/testdata/env-sh:8:5: found test ... == ...: [ a == b ] The "test" command, as well as the "[" command, are not required to know the "==" operator. Only a few implementations like bash and some @@ -40,6 +40,6 @@ files/testdata/random:7:1: $RANDOM: $RANDOM not be used in shell programs that are meant to be portable across a large number of POSIX-like systems. -files/testdata/test-eqeq:7:7: found test ... == ...: test a == b # bad -files/testdata/test-eqeq:10:4: found test ... == ...: [ a == b ] # bad -files/testdata/test-eqeq:14:4: found test ... == ...: [ a == b -a c == d ] +files/testdata/test-eqeq:7:8: found test ... == ...: test a == b # bad +files/testdata/test-eqeq:10:5: found test ... == ...: [ a == b ] # bad +files/testdata/test-eqeq:14:5: found test ... == ...: [ a == b -a c == d ] |