fix test failure with busybox
v3 cover fix test failure with busybox
Despite non-compiance from busybox's sh(1), grep(1), diff(1), find(1) Alpine Linux is still a popular choice for container these days.
Fix false-positive failure in testsuite when run in Alpine Linux.
Đoàn Trần Công Danh (8):
t4061: use POSIX compliant regex(7)
test-lib-functions: test_cmp: eval $GIT_TEST_CMP
t5003: drop the subshell in test_lazy_prereq
t5003: skip conversion test if unzip -a is unavailable
t5616: use rev-parse instead to get HEAD's object_id
t7063: drop non-POSIX argument "-ls" from find(1)
t4124: fix test for non-compliant diff(1)
t5703: feed raw data into test-tool unpack-sideband
t/helper/test-pkt-line.c | 2 +- t/t4061-diff-indent.sh | 2 +- t/t4124-apply-ws-rule.sh | 6 ++++++ t/t5003-archive-zip.sh | 24 ++++++++++++------------ t/t5616-partial-clone.sh | 2 +- t/t5703-upload-pack-ref-in-want.sh | 5 +---- t/t7063-status-untracked-cache.sh | 2 +- t/test-lib-functions.sh | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-)
Range-diff against v2:
1: 34f96548de = 1: 088905ab6f t4061: use POSIX compliant regex(7) 2: 50f46986a6 = 2: 691d9d47ba test-lib-functions: test_cmp: eval $GIT_TEST_CMP 3: 8719a07753 = 3: 759a589b83 t5003: drop the subshell in test_lazy_prereq 4: 457eecaf9b = 4: e5b09c290c t5003: skip conversion test if unzip -a is unavailable 5: d3bc855e17 = 5: 1b8740018c t5616: use rev-parse instead to get HEAD's object_id 6: 64472ec3bc ! 6: abb21b9e51 t7063: drop non-POSIX argument "-ls" from find(1)
@@ Commit message
However, -ls flag isn't required by POSIX's find(1), and busybox(1) doesn't implement it.
- From the original conversation, it seems like find(1) with "-type d"
- could trigger enough "lstat(2)" to ask FreeBSD update mtime.
-
- Use only filter "-type d" for now.
+ Use "-exec ls -ld {} +" instead.
@@ t/t7063-status-untracked-cache.sh: GIT_FORCE_UNTRACKED_CACHE=true
sync_mtime () {
- find . -type d -ls >/dev/null
-+ find . -type d >/dev/null
++ find . -type d -exec ls -ld {} + >/dev/null
}
avoid_racy() {
7: 51df6dd12d ! 7: 0502171f0f t4124: fix test for non-compliant diff(1)
@@ Commit message
POSIX's diff(1) requires output in normal diff format. However, busybox's diff's output is written in unified format.
- POSIX requires no option for normal-diff format.
+ HP-UX's diff(1) doesn't understand "-u" as of now.
- A hint in test-lib-functions::test_cmp said diff -u isn't available
- everywhere.
-
- Workaround this problem by assuming diff(1) output is unified
+ Workaround this problem by checking "diff -u" output,
if we couldn't make anything from normal-diff format.
@@ t/t4124-apply-ws-rule.sh: test_fix () {
# find touched lines
$DIFF file target | sed -n -e "s/^> //p" >fixed
-+ # busybox's diff(1) output unified format
++ # busybox's diff(1) doesn't output normal format
+ if ! test -s fixed; then
-+ $DIFF file target |
++ $DIFF -u file target |
+ grep -v '^+++ target' |
+ sed -e "/^+/s/+//" >fixed
+ fi
8: 843c7f66d9 = 8: 8689e03400 t5703: feed raw data into test-tool unpack-sideband
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 1/8 t4061: use POSIX compliant regex(7)
BRE interprets + literally, and\+ is undefined for POSIX BRE, from:
https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_03_02
Quoted 5 lines
The interpretation of an ordinary character preceded by an unescaped <backslash> ( '\\' ) is undefined, except for:
- The characters ')', '(', '{', and '}'
- The digits 1 to 9 inclusive
- A character inside a bracket expression
This test is failing with busybox sed, the default sed of Alpine Linux
We have 2 options here:
- Using literal + because BRE will interpret it as-is, or
- Using character class [+] to defend against a sed that expects ERE
ERE-expected sed is theoretical at this point,
but we haven't found it, yet.
And, we may run into other problems with that sed.
Let's go with first option and fix it later if that sed could be found.
--- t/t4061-diff-indent.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/t4061-diff-indent.sh +1 -1
@@ -17,7 +17,7 @@ compare_diff () { # Compare blame output using the expectation for a diff as reference. # Only look for the lines coming from non-boundary commits. compare_blame () { - sed -n -e "1,4d" -e "s/^\+//p" <"$1" >.tmp-1 + sed -n -e "1,4d" -e "s/^+//p" <"$1" >.tmp-1 sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2 test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2 }
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 2/8 test-lib-functions: test_cmp: eval $GIT_TEST_CMP
In reply to Đoàn Trần Công DanhShell recognises first non-assignment token as command name. With /bin/sh linked to either /bin/bash or /bin/dash, cd t/perf && ./p0000-perf-lib-sanity.sh -d -i -v reports:
Quoted 1 line
test_cmp:1: command not found: diff -u
Using eval to unquote $GIT_TEST_CMP as same as precedence in git_editor.
--- t/test-lib-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/test-lib-functions.sh +1 -1
@@ -905,7 +905,7 @@ test_expect_code () { # - not all diff versions understand "-u" test_cmp() { - $GIT_TEST_CMP "$@" + eval "$GIT_TEST_CMP" '"$@"' } # Check that the given config key has the expected value.
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 3/8 t5003: drop the subshell in test_lazy_prereq
In reply to Đoàn Trần Công Danhtest_lazy_prereq will be evaluated in a throw-away directory.
Drop unnecessary subshell and mkdir.
--- t/t5003-archive-zip.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
t/t5003-archive-zip.sh +2 -6
@@ -7,12 +7,8 @@ test_description='git archive --format=zip test' SUBSTFORMAT=%H%n test_lazy_prereq UNZIP_SYMLINKS ' - ( - mkdir unzip-symlinks && - cd unzip-symlinks && - "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && - test -h symlink - ) + "$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip && + test -h symlink ' check_zip() {
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 4/8 t5003: skip conversion test if unzip -a is unavailable
In reply to Đoàn Trần Công DanhAlpine Linux's default unzip(1) doesn't support -a.
Skip those tests on that platform.
--- t/t5003-archive-zip.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
t/t5003-archive-zip.sh +10 -6
@@ -11,6 +11,10 @@ test_lazy_prereq UNZIP_SYMLINKS ' test -h symlink ' +test_lazy_prereq UNZIP_CONVERT ' + "$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip +' + check_zip() { zipfile=$1.zip listfile=$1.lst
@@ -35,33 +39,33 @@ check_zip() { extracted=${dir_with_prefix}a original=a - test_expect_success UNZIP " extract ZIP archive with EOL conversion" ' + test_expect_success UNZIP_CONVERT " extract ZIP archive with EOL conversion" ' (mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile) ' - test_expect_success UNZIP " validate that text files are converted" " + test_expect_success UNZIP_CONVERT " validate that text files are converted" " test_cmp_bin $extracted/text.cr $extracted/text.crlf && test_cmp_bin $extracted/text.cr $extracted/text.lf " - test_expect_success UNZIP " validate that binary files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that binary files are unchanged" " test_cmp_bin $original/binary.cr $extracted/binary.cr && test_cmp_bin $original/binary.crlf $extracted/binary.crlf && test_cmp_bin $original/binary.lf $extracted/binary.lf " - test_expect_success UNZIP " validate that diff files are converted" " + test_expect_success UNZIP_CONVERT " validate that diff files are converted" " test_cmp_bin $extracted/diff.cr $extracted/diff.crlf && test_cmp_bin $extracted/diff.cr $extracted/diff.lf " - test_expect_success UNZIP " validate that -diff files are unchanged" " + test_expect_success UNZIP_CONVERT " validate that -diff files are unchanged" " test_cmp_bin $original/nodiff.cr $extracted/nodiff.cr && test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf " - test_expect_success UNZIP " validate that custom diff is unchanged " " + test_expect_success UNZIP_CONVERT " validate that custom diff is unchanged " " test_cmp_bin $original/custom.cr $extracted/custom.cr && test_cmp_bin $original/custom.crlf $extracted/custom.crlf && test_cmp_bin $original/custom.lf $extracted/custom.lf
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 5/8 t5616: use rev-parse instead to get HEAD's object_id
In reply to Đoàn Trần Công DanhOnly HEAD's object_id is necessary, rev-list is an overkill.
Despite POSIX requires grep(1) treat single pattern with <newline> as multiple patterns.
busybox's grep(1) (as of v1.31.1) haven't implemented it yet.
Use rev-parse to simplify the test and avoid busybox unimplemented features.
--- t/t5616-partial-clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/t5616-partial-clone.sh +1 -1
@@ -49,7 +49,7 @@ test_expect_success 'do partial clone 1' ' test_expect_success 'verify that .promisor file contains refs fetched' ' ls pc1/.git/objects/pack/pack-*.promisor >promisorlist && test_line_count = 1 promisorlist && - git -C srv.bare rev-list HEAD >headhash && + git -C srv.bare rev-parse --verify HEAD >headhash && grep "$(cat headhash) HEAD" $(cat promisorlist) && grep "$(cat headhash) refs/heads/master" $(cat promisorlist) '
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 6/8 t7063: drop non-POSIX argument "-ls" from find(1)
In reply to Đoàn Trần Công DanhSince commit 6b7728db81, (t7063: work around FreeBSD's lazy mtime update feature, 2016-08-03), we started to use ls as a trick to update directory's mtime.
However, -ls flag isn't required by POSIX's find(1), and busybox(1) doesn't implement it.
Use "-exec ls -ld {} +" instead.
--- t/t7063-status-untracked-cache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
t/t7063-status-untracked-cache.sh +1 -1
@@ -18,7 +18,7 @@ GIT_FORCE_UNTRACKED_CACHE=true export GIT_FORCE_UNTRACKED_CACHE sync_mtime () { - find . -type d -ls >/dev/null + find . -type d -exec ls -ld {} + >/dev/null } avoid_racy() {
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 7/8 t4124: fix test for non-compliant diff(1)
In reply to Đoàn Trần Công DanhPOSIX's diff(1) requires output in normal diff format. However, busybox's diff's output is written in unified format.
HP-UX's diff(1) doesn't understand "-u" as of now.
Workaround this problem by checking "diff -u" output, if we couldn't make anything from normal-diff format.
--- t/t4124-apply-ws-rule.sh | 6 ++++++ 1 file changed, 6 insertions(+)
t/t4124-apply-ws-rule.sh +6 -0
@@ -52,6 +52,12 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed + # busybox's diff(1) doesn't output normal format + if ! test -s fixed; then + $DIFF -u file target | + grep -v '^+++ target' | + sed -e "/^+/s/+//" >fixed + fi # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed)
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d
PATCH v3 8/8 t5703: feed raw data into test-tool unpack-sideband
In reply to Đoàn Trần Công Danhbusybox's sed isn't binary clean.
Thus, triggers false-negative on this test.
We could replace sed with perl on this usecase.
But, we could slightly modify the helper to discard unwanted data in the beginning.
Fix the false negative by updating this helper.
--- t/helper/test-pkt-line.c | 2 +- t/t5703-upload-pack-ref-in-want.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)
t/helper/test-pkt-line.c +1 -1
@@ -67,7 +67,7 @@ static void unpack_sideband(void)case PACKET_READ_NORMAL : band = reader.line[0 ] &0xff ;if (band <1 || band >2 ) -die ("unexpected side band %d" , band); +continue ;/* skip non-sideband packets */ fd = band;write_or_die (fd, reader.line +1 , reader.pktlen -1 );
t/t5703-upload-pack-ref-in-want.sh +1 -4
@@ -13,10 +13,7 @@ get_actual_refs () { } get_actual_commits () { - sed -n -e '/packfile/,/0000/{ - /packfile/d - p - }' <out | test-tool pkt-line unpack-sideband >o.pack && + test-tool pkt-line unpack-sideband <out >o.pack && git index-pack o.pack && git verify-pack -v o.idx >objs && grep commit objs | cut -d" " -f1 | sort >actual_commits
Signature · 1 line
2.26.0.rc2.357.g1e1ba0441d