check-portability: always skip files whose name ends with tilde

Suggested by wiz.

2 files changed, 8 insertions, 29 deletions

diff --git a/mk/check/check-portability.sh b/mk/check/check-portability.sh
index 0f48cd8c08d..2e27212b236 100644
--- a/mk/check/check-portability.sh
+++ b/mk/check/check-portability.sh
@@ -1,4 +1,4 @@
-# $NetBSD: check-portability.sh,v 1.22 2020/05/05 05:55:26 rillig Exp $
+# $NetBSD: check-portability.sh,v 1.23 2021/01/04 21:10:01 rillig Exp $
 #
 # This program checks all files in the current directory and any
 # subdirectories for portability issues that are likely to result in
@@ -55,10 +55,11 @@ find ./* -type f -print 2>/dev/null \
 
 		skip=no
 		eval "case \"\$fname\" in $SKIP_FILTER *.orig) skip=yes;; esac"
-		case "$fname" in *.in)
-			case ",$patched_files," in *,"${fname%.in}",*)
+		case "$fname" in
+		*.in)	case ",$patched_files," in *,"${fname%.in}",*)
 				skip=yes
-			esac
+			esac;;
+		*~)	skip=yes;;
 		esac
 		[ $skip = no ] || continue
 
diff --git a/regress/infra-unittests/check-portability.sh b/regress/infra-unittests/check-portability.sh
index d38fed023eb..d1847b1421c 100644
--- a/regress/infra-unittests/check-portability.sh
+++ b/regress/infra-unittests/check-portability.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: check-portability.sh,v 1.6 2021/01/04 21:07:31 rillig Exp $
+# $NetBSD: check-portability.sh,v 1.7 2021/01/04 21:10:01 rillig Exp $
 #
 # Test cases for mk/check/check-portability.*.
 #
@@ -265,30 +265,8 @@ if test_case_begin 'always skip tilde files'; then
 	check_portability_sh \
 		'CHECK_PORTABILITY_EXPERIMENTAL=no'
 
-	create_file 'expected' <<'EOF'
-ERROR: [check-portability.awk] => Found test ... == ...:
-ERROR: [check-portability.awk] configure~:2: test a == b
-
-Explanation:
-===========================================================================
-The "test" command, as well as the "[" command, are not required to know
-the "==" operator. Only a few implementations like bash and some
-versions of ksh support it.
-
-When you run "test foo == foo" on a platform that does not support the
-"==" operator, the result will be "false" instead of "true". This can
-lead to unexpected behavior.
-
-There are two ways to fix this error message. If the file that contains
-the "test ==" is needed for building the package, you should create a
-patch for it, replacing the "==" operator with "=". If the file is not
-needed, add its name to the CHECK_PORTABILITY_SKIP variable in the
-package Makefile.
-===========================================================================
-
-EOF
-	assert_that "$tmpdir/out" --file-equals 'expected'
-	assert_that $exitcode --equals 1
+	assert_that "$tmpdir/out" --file-is-empty
+	assert_that $exitcode --equals 0
 
 	test_case_end
 fi