git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Allen <mrallen1@yahoo.com>
To: git@vger.kernel.org
Subject: [PATCH] Make tests more portable
Date: Tue, 24 May 2005 21:52:28 -0700 (PDT)	[thread overview]
Message-ID: <20050525045229.29706.qmail@web41205.mail.yahoo.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

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

[-- Attachment #2: 3636773645-git-tests.patch --]
[-- Type: application/octet-stream, Size: 2586 bytes --]

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 <mallen@aeris.local> 1116996230 -0500
committer Mark Allen <mallen@aeris.local> 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 <<EOF
+.output
 path0
 path1
 path2/file2

             reply	other threads:[~2005-05-25  4:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-25  4:52 Mark Allen [this message]
2005-05-25  5:11 ` [PATCH] Make tests more portable Junio C Hamano
2005-05-26  0:07 ` Junio C Hamano

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=20050525045229.29706.qmail@web41205.mail.yahoo.com \
    --to=mrallen1@yahoo.com \
    --cc=git@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).