From: Junio C Hamano Date: Thu, 26 May 2005 00:07:33 GMT Subject: [PATCH] Make tests more portable Message-ID: <7vsm0ahmt6.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20050525045229.29706.qmail@web41205.mail.yahoo.com> This is the remainder of testcase fix by Mark Allen to make them work on his Darwin box. I was using "xargs -r" (GNU) where it was not needed, sed -ne '/^\(author\|committer\)/s|>.*|>|p' where his sed does not know what to do with '\|', and "cmp - file" to compare standard input with a file, which his cmp does not support. Another problem his patch fixed has been merged in the tip of your git.git already. Author: Mark Allen Author-Date: Tue, 24 May 2005 21:52:28 -0700 Signed-off-by: Junio C Hamano --- t/t0000-basic.sh | 2 +- t/t0110-environment-names-old.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -84,7 +84,7 @@ do done test_expect_success \ 'adding various types of objects with git-update-cache --add.' \ - 'find path* ! -type d -print0 | xargs -0 -r git-update-cache --add' + 'find path* ! -type d -print0 | xargs -0 git-update-cache --add' # Show them and see that matches what we expect. test_expect_success \ diff --git a/t/t0110-environment-names-old.sh b/t/t0110-environment-names-old.sh --- a/t/t0110-environment-names-old.sh +++ b/t/t0110-environment-names-old.sh @@ -86,8 +86,7 @@ committer A U Thor EOF test_expect_success \ 'verify old AUTHOR variables were used correctly in commit' \ - 'sed -ne '\''/^\(author\|committer\)/s|>.*|>|p'\'' current | - cmp - expected' + 'sed -ne '\''/^\(author\)/s|>.*|>|p'\'' -e'\''/^\(committer\)/s|>.*|>|p'\''\ current > out && cmp out expected' unset GIT_DIR test_expect_success \ @@ -128,7 +127,6 @@ committer R O Htua EOF test_expect_success \ 'verify new AUTHOR variables were used correctly in commit.' \ - 'sed -ne '\''/^\(author\|committer\)/s|>.*|>|p'\'' current | - cmp - expected' + 'sed -ne '\''/^\(author\)/s|>.*|>|p'\'' -e'\''/^\(committer\)/s|>.*|>|p'\''\ current > out && cmp out expected' test_done ------------------------------------------------