# [PATCH] Make tests more portable 3 messages from 2005-05-25 to 2005-05-26. Participants: Mark Allen, Junio C Hamano. Thread: https://gitlist.dev/t/710 ## Mark Allen, 2005-05-25 04:52 Subject: [PATCH] Make tests more portable Message-ID: <20050525045229.29706.qmail@web41205.mail.yahoo.com> URL: https://gitlist.dev/e/20050525045229.29706.qmail%40web41205.mail.yahoo.com ``` I made some minor changes to the test suite to make the tests more portable. The sed on Darwin doesn't understand extended regex, cmp won't read from '-', and xargs doesn't have an '-r' command line flag. The t3000 test was broken because it wasn't updated when Linus merged Junio's patch to make git-ls-files show filenames with leading dots. I fixed that with a trivial addition. Cheers, --Mark Make t0000-basic.sh and t0110-environment-names-old.sh more portable. Fix t3000-ls-files-others to pick up filenames that start with dots. --- commit 36c3e78b55d6740201296aadd32430c0212ad0bf tree b17eadf351f4d2a9c7f8851863188ddb8e9e3c5a parent c4ee2952b3146fe7dc9433b92bf066e55987ef74 author Mark Allen 1116996230 -0500 committer Mark Allen 1116996230 -0500 t0000-basic.sh | 2 +- t0110-environment-names-old.sh | 6 ++---- t3000-ls-files-others.sh | 1 + 3 files changed, 4 insertions, 5 deletions Index: t/t0000-basic.sh =================================================================== --- 0a6dd114f3cbd19fc9773dc31f19c21b59007800/t/t0000-basic.sh (mode:100755) +++ b17eadf351f4d2a9c7f8851863188ddb8e9e3c5a/t/t0000-basic.sh (mode:100755) @@ -84,7 +84,7 @@ 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 \ Index: t/t0110-environment-names-old.sh =================================================================== --- 0a6dd114f3cbd19fc9773dc31f19c21b59007800/t/t0110-environment-names-old.sh (mode:100755) +++ b17eadf351f4d2a9c7f8851863188ddb8e9e3c5a/t/t0110-environment-names-old.sh (mode:100755) @@ -86,8 +86,7 @@ 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 @@ 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 Index: t/t3000-ls-files-others.sh =================================================================== --- 0a6dd114f3cbd19fc9773dc31f19c21b59007800/t/t3000-ls-files-others.sh (mode:100755) +++ b17eadf351f4d2a9c7f8851863188ddb8e9e3c5a/t/t3000-ls-files-others.sh (mode:100755) @@ -22,6 +22,7 @@ 'git-ls-files --others to show output.' \ 'git-ls-files --others >.output' cat >.expected < URL: https://gitlist.dev/e/7vis17opnz.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20050525045229.29706.qmail@web41205.mail.yahoo.com> ``` >>>>> "MA" == Mark Allen writes: MA> I made some minor changes to the test suite to make the MA> tests more portable. The sed on Darwin doesn't understand MA> extended regex, cmp won't read from '-', and xargs doesn't MA> have an '-r' command line flag. Thank you for doing this. MA> The t3000 test was broken because it wasn't updated when MA> Linus merged Junio's patch to make git-ls-files show MA> filenames with leading dots. I fixed that with a trivial MA> addition. Not updating the tests to match code was my fault, not Linus. Thanks again for the fix. ``` ## Junio C Hamano, 2005-05-26 00:07 Subject: [PATCH] Make tests more portable Message-ID: <7vsm0ahmt6.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vsm0ahmt6.fsf%40assigned-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 ------------------------------------------------ ```