All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] Test case portability fix.
Date: Wed, 25 May 2005 19:11:31 -0700	[thread overview]
Message-ID: <7vr7fug2i4.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 7v1x7uj4i3.fsf_-_@assigned-by-dhcp.cox.net

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.

Author: Mark Allen <mrallen1@yahoo.com>
Author-Date: 
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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 <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
------------------------------------------------


  reply	other threads:[~2005-05-26  2:09 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-25 11:17 change of git-diff-tree and symlinks Kay Sievers
2005-05-25 18:08 ` Linus Torvalds
2005-05-25 18:35   ` Kay Sievers
2005-05-25 19:40     ` Junio C Hamano
2005-05-25 22:06       ` [PATCH] Adjust show-files test for dotfiles Junio C Hamano
2005-05-25 22:07       ` [PATCH] Fix type-change handling when assigning the status code to filepairs Junio C Hamano
2005-05-25 22:26       ` change of git-diff-tree and symlinks Kay Sievers
2005-05-25 22:43         ` Junio C Hamano
2005-05-25 22:47         ` Linus Torvalds
2005-05-25 23:00           ` [PATCH] Mode only changes from diff Junio C Hamano
2005-05-26  2:11             ` Junio C Hamano [this message]
2005-05-26  2:36               ` [PATCH] Test case portability fix Linus Torvalds
2005-05-26  2:55                 ` Junio C Hamano
2005-05-29 14:16 ` change of git-diff-tree and symlinks Jochen Roemling
2005-05-29 15:06   ` Kay Sievers
2005-05-29 16:06     ` Jochen Roemling
2005-05-29 16:14       ` Sebastian Kuzminsky
2005-05-30  3:17       ` Sebastian Kuzminsky
2005-05-29 18:55     ` Junio C Hamano
2005-05-29 21:32     ` Petr Baudis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vr7fug2i4.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.