Skip to content

Commit 2a59a6e

Browse files
avargitster
authored andcommitted
tests: fix and add lint for non-portable head -c N
The "head -c BYTES" option is non-portable (not in POSIX[1]). Change such invocations to use the test_copy_bytes wrapper added in 4886081 ("t9300: factor out portable "head -c" replacement", 2016-06-30). This fixes a test added in 9d2e330 ("ewah_read_mmap: bounds-check mmap reads", 2018-06-14), which has been breaking t5310-pack-bitmaps.sh on OpenBSD since 2.18.0. The OpenBSD ports already have a similar workaround after their upgrade to 2.18.0[2]. I have not tested this on IRIX, but according to 4de0bbd ("t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge", 2010-12-13) this invocation would have broken things there too. Also, change a valgrind-specific codepath in test-lib.sh to use this wrapper. Given where valgrind runs I don't think this would ever become a portability issue in practice, but it's easier to just use the wrapper than introduce some exception for the "make test-lint" check being added here. 1. http://pubs.opengroup.org/onlinepubs/9699919799/utilities/head.html 2. openbsd/ports@08d5d82#diff-f7d3c4fabeed1691620d608f1534f5e5 Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 29d9e3e commit 2a59a6e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

t/check-non-portable-shell.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ sub err {
4141
/^\s*[^#]\s*which\s/ and err 'which is not portable (use type)';
4242
/\btest\s+[^=]*==/ and err '"test a == b" is not portable (use =)';
4343
/\bwc -l.*"\s*=/ and err '`"$(wc -l)"` is not portable (use test_line_count)';
44+
/\bhead\s+-c\b/ and err 'head -c is not portable (use test_copy_bytes BYTES <file >out)';
4445
/\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)';
4546
/^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
4647
err '"FOO=bar shell_func" assignment extends beyond "shell_func"';

t/t5310-pack-bitmaps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ test_expect_success 'truncated bitmap fails gracefully' '
335335
git rev-list --use-bitmap-index --count --all >expect &&
336336
bitmap=$(ls .git/objects/pack/*.bitmap) &&
337337
test_when_finished "rm -f $bitmap" &&
338-
head -c 512 <$bitmap >$bitmap.tmp &&
338+
test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
339339
mv -f $bitmap.tmp $bitmap &&
340340
git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
341341
test_cmp expect actual &&

t/test-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ then
867867
# handle only executables, unless they are shell libraries that
868868
# need to be in the exec-path.
869869
test -x "$1" ||
870-
test "# " = "$(head -c 2 <"$1")" ||
870+
test "# " = "$(test_copy_bytes 2 <"$1")" ||
871871
return;
872872

873873
base=$(basename "$1")
@@ -882,7 +882,7 @@ then
882882
# do not override scripts
883883
if test -x "$symlink_target" &&
884884
test ! -d "$symlink_target" &&
885-
test "#!" != "$(head -c 2 < "$symlink_target")"
885+
test "#!" != "$(test_copy_bytes 2 <"$symlink_target")"
886886
then
887887
symlink_target=../valgrind.sh
888888
fi

0 commit comments

Comments
 (0)