don't use test_must_fail with grep
test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller <sbeller@google.com> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
a274e0a036
commit
c7cf956618
@ -55,7 +55,7 @@ test_expect_success 'clone to target directory with --stdlayout' '
|
||||
test_expect_success 'init without -s/-T/-b/-t does not warn' '
|
||||
test ! -d trunk &&
|
||||
git svn init "$svnrepo"/project/trunk trunk 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
rm -rf trunk &&
|
||||
rm -f warning
|
||||
'
|
||||
@ -63,7 +63,7 @@ test_expect_success 'init without -s/-T/-b/-t does not warn' '
|
||||
test_expect_success 'clone without -s/-T/-b/-t does not warn' '
|
||||
test ! -d trunk &&
|
||||
git svn clone "$svnrepo"/project/trunk 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
rm -rf trunk &&
|
||||
rm -f warning
|
||||
'
|
||||
@ -86,7 +86,7 @@ EOF
|
||||
test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
|
||||
test ! -d project &&
|
||||
git svn init -s "$svnrepo"/project project 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
test_svn_configured_prefix "origin/" &&
|
||||
rm -rf project &&
|
||||
rm -f warning
|
||||
@ -95,7 +95,7 @@ test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
|
||||
test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
|
||||
test ! -d project &&
|
||||
git svn clone -s "$svnrepo"/project 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
test_svn_configured_prefix "origin/" &&
|
||||
rm -rf project &&
|
||||
rm -f warning
|
||||
@ -104,7 +104,7 @@ test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
|
||||
test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
|
||||
test ! -d project &&
|
||||
git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
test_svn_configured_prefix "" &&
|
||||
rm -rf project &&
|
||||
rm -f warning
|
||||
@ -113,7 +113,7 @@ test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
|
||||
test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
|
||||
test ! -d project &&
|
||||
git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
|
||||
test_must_fail grep -q prefix warning &&
|
||||
! grep -q prefix warning &&
|
||||
test_svn_configured_prefix "" &&
|
||||
rm -rf project &&
|
||||
rm -f warning
|
||||
|
||||
Reference in New Issue
Block a user