diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-30 10:49:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 10:49:13 -0700 |
| commit | 44a9cedb005b0b8be31dccd8e6ddf97074a01345 (patch) | |
| tree | c32849c1c9c498cc7d2ab4072c4dfbbcee0e97c9 /t | |
| parent | Merge branch 'maint' (diff) | |
| parent | tests: kill backgrounded processes more robustly (diff) | |
| download | tgif-44a9cedb005b0b8be31dccd8e6ddf97074a01345.tar.xz | |
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn
* 'svn-fe' of git://repo.or.cz/git/jrn:
tests: kill backgrounded processes more robustly
vcs-svn: a void function shouldn't try to return something
tests: make sure input to sed is newline terminated
vcs-svn: add missing cast to printf argument
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0081-line-buffer.sh | 12 | ||||
| -rwxr-xr-x | t/t9010-svn-fe.sh | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/t/t0081-line-buffer.sh b/t/t0081-line-buffer.sh index 1dbe1c9b08..5067d1e15b 100755 --- a/t/t0081-line-buffer.sh +++ b/t/t0081-line-buffer.sh @@ -47,10 +47,10 @@ long_read_test () { rm -f input && mkfifo input && { - { + ( generate_tens_of_lines $tens_of_lines "$line" && - sleep 100 - } >input & + exec sleep 100 + ) >input & } && test-line-buffer input <<-EOF >output && binary $readsize @@ -109,11 +109,11 @@ test_expect_success PIPE '1-byte read, no input available' ' rm -f input && mkfifo input && { - { + ( printf "%s" a && printf "%s" b && - sleep 100 - } >input & + exec sleep 100 + ) >input & } && test-line-buffer input <<-\EOF >actual && binary 1 diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh index 478c860647..6f6175a8f7 100755 --- a/t/t9010-svn-fe.sh +++ b/t/t9010-svn-fe.sh @@ -407,7 +407,7 @@ test_expect_success 'NUL in log message, file content, and property name' ' OBJID :000000 100644 OBJID OBJID A greeting EOF - printf "\n%s" "something with an ASCII NUL (Q)" >expect.message && + printf "\n%s\n" "something with an ASCII NUL (Q)" >expect.message && printf "%s\n" "helQo" >expect.hello1 && printf "%s\n" "link hello" >expect.hello2 && { @@ -465,7 +465,11 @@ test_expect_success 'NUL in log message, file content, and property name' ' git diff-tree --root --stdin | sed "s/$_x40/OBJID/g" } >actual && - git cat-file commit HEAD | nul_to_q | sed -ne "/^\$/,\$ p" >actual.message && + { + git cat-file commit HEAD | nul_to_q && + echo + } | + sed -ne "/^\$/,\$ p" >actual.message && git cat-file blob HEAD^:greeting | nul_to_q >actual.hello1 && git cat-file blob HEAD:greeting | nul_to_q >actual.hello2 && test_cmp expect actual && |