summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Allen <mrallen1@yahoo.com>2005-05-26 02:11:31 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-26 02:37:10 (GMT)
commit368da62598b30a521970866327ce493e34f7f590 (patch)
tree5bf62fbb926ae751c9320c1371f34499f45e027b
parentbd1e17e245153fdc75feaaf5e556b922d98ca699 (diff)
downloadgit-368da62598b30a521970866327ce493e34f7f590.zip
git-368da62598b30a521970866327ce493e34f7f590.tar.gz
git-368da62598b30a521970866327ce493e34f7f590.tar.bz2
[PATCH] Test case portability fix.
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 some sed does not know what to do with '\|', and also "cmp - file" to compare standard input with a file, which his cmp does not support. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rwxr-xr-xt/t0000-basic.sh2
-rwxr-xr-xt/t0110-environment-names-old.sh6
2 files changed, 3 insertions, 5 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 88a9a00..b521f51 100755
--- 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
index 9389796..c548b9b 100755
--- a/t/t0110-environment-names-old.sh
+++ b/t/t0110-environment-names-old.sh
@@ -86,8 +86,7 @@ committer A U Thor <author@example.xz>
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 <rohtua@example.xz>
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