From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: Re: [PATCH v4 00/12] Wildmatch v4
Date: Sat, 13 Oct 2012 10:49:34 +0700 [thread overview]
Message-ID: <20121013034934.GA27791@do> (raw)
In-Reply-To: <7vbog74o59.fsf@alter.siamese.dyndns.org>
On Fri, Oct 12, 2012 at 10:05:06AM -0700, Junio C Hamano wrote:
> Nguyen, how about updating the match () shell function in 3070 so
> that it not just says not-ok, but indicates what failed (wildmatch
> failed, or wildmatch passed but fnmatch failed), at least when the
> test is run as "./t3070-*.sh -v -i"?
You could squash this to the "Integrate wildmatch to git" patch, or
just put it at the end of the series (I'll need to send a series
update anyway). This splits fnmatch and wildmatch tests separately so
we can easily identify which one fails.
-- 8< --
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index c3ee729..4f97923 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -5,20 +5,28 @@ test_description='wildmatch tests'
. ./test-lib.sh
match() {
- test_expect_success "wildmatch $*" "
- if [ $1 = 1 ]; then
+ if [ $1 = 1 ]; then
+ test_expect_success "wildmatch: match $3 $4" "
test-wildmatch wildmatch '$3' '$4'
- else
+ "
+ else
+ test_expect_success "wildmatch: no match $3 $4" "
! test-wildmatch wildmatch '$3' '$4'
- fi &&
- if [ $2 = 1 ]; then
+ "
+ fi
+ if [ $2 = 1 ]; then
+ test_expect_success "fnmatch: match $3 $4" "
test-wildmatch fnmatch '$3' '$4'
- elif [ $2 = x ]; then
- true
- else
+ "
+ elif [ $2 = 0 ]; then
+ test_expect_success "fnmatch: no match $3 $4" "
! test-wildmatch fnmatch '$3' '$4'
- fi
- "
+ "
+# else
+# test_expect_success BROKEN_FNMATCH "fnmatch: $3 $4" "
+# test-wildmatch fnmatch '$3' '$4'
+# "
+ fi
}
# Basic wildmat features
-- 8< --
--
Duy
prev parent reply other threads:[~2012-10-13 3:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-10 10:40 [PATCH v4 00/12] Wildmatch v4 Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 01/12] ctype: make sane_ctype[] const array Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 03/12] Import wildmatch from rsync Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 04/12] wildmatch: remove unnecessary functions Nguyễn Thái Ngọc Duy
2012-10-10 15:38 ` Michael Haggerty
2012-10-10 10:40 ` [PATCH v4 05/12] Integrate wildmatch to git Nguyễn Thái Ngọc Duy
2012-10-12 7:27 ` Johannes Sixt
2012-10-12 17:30 ` Junio C Hamano
2012-10-10 10:40 ` [PATCH v4 06/12] wildmatch: make wildmatch's return value compatible with fnmatch Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 07/12] wildmatch: remove static variable force_lower_case Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 08/12] wildmatch: fix case-insensitive matching Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 09/12] wildmatch: adjust "**" behavior Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 10/12] wildmatch: make /**/ match zero or more directories Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 11/12] Support "**" wildcard in .gitignore and .gitattributes Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc Nguyễn Thái Ngọc Duy
2012-10-12 7:22 ` Johannes Sixt
2012-10-12 9:49 ` Nguyen Thai Ngoc Duy
2012-10-10 23:48 ` [PATCH v4 00/12] Wildmatch v4 Junio C Hamano
2012-10-11 4:33 ` Junio C Hamano
2012-10-11 11:56 ` Nguyen Thai Ngoc Duy
2012-10-11 16:09 ` Junio C Hamano
2012-10-11 17:09 ` Junio C Hamano
2012-10-11 23:50 ` Junio C Hamano
2012-10-12 16:44 ` Torsten Bögershausen
2012-10-12 17:05 ` Junio C Hamano
2012-10-12 20:28 ` Torsten Bögershausen
2012-10-13 3:49 ` Nguyen Thai Ngoc Duy [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121013034934.GA27791@do \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=tboegi@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).