kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t9119: fix broken &&-chains 

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Eric Sunshine 2018-07-01 20:24:05 -04:00 committed by Junio C Hamano
parent cff4243db9
commit f9f7c116a3
1 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
t/t9119-git-svn-info.sh
View File

@ -22,8 +22,8 @@ esac
# same value as "svn info" (i.e. the commit timestamp that touched the # same value as "svn info" (i.e. the commit timestamp that touched the
# path most recently); do not expect that field to match. # path most recently); do not expect that field to match.
test_cmp_info () { test_cmp_info () {
sed -e '/^Text Last Updated:/d' "$1" >tmp.expect sed -e '/^Text Last Updated:/d' "$1" >tmp.expect &&
sed -e '/^Text Last Updated:/d' "$2" >tmp.actual sed -e '/^Text Last Updated:/d' "$2" >tmp.actual &&
test_cmp tmp.expect tmp.actual && test_cmp tmp.expect tmp.actual &&
rm -f tmp.expect tmp.actual rm -f tmp.expect tmp.actual
} }
@ -59,24 +59,24 @@ test_expect_success 'setup repository and import' '
' '


test_expect_success 'info' " test_expect_success 'info' "
(cd svnwc; svn info) > expected.info && (cd svnwc && svn info) > expected.info &&
(cd gitwc; git svn info) > actual.info && (cd gitwc && git svn info) > actual.info &&
test_cmp_info expected.info actual.info test_cmp_info expected.info actual.info
" "


test_expect_success 'info --url' ' test_expect_success 'info --url' '
test "$(cd gitwc; git svn info --url)" = "$quoted_svnrepo" test "$(cd gitwc && git svn info --url)" = "$quoted_svnrepo"
' '


test_expect_success 'info .' " test_expect_success 'info .' "
(cd svnwc; svn info .) > expected.info-dot && (cd svnwc && svn info .) > expected.info-dot &&
(cd gitwc; git svn info .) > actual.info-dot && (cd gitwc && git svn info .) > actual.info-dot &&
test_cmp_info expected.info-dot actual.info-dot test_cmp_info expected.info-dot actual.info-dot
" "


test_expect_success 'info $(pwd)' ' test_expect_success 'info $(pwd)' '
(cd svnwc; svn info "$(pwd)") >expected.info-pwd && (cd svnwc && svn info "$(pwd)") >expected.info-pwd &&
(cd gitwc; git svn info "$(pwd)") >actual.info-pwd && (cd gitwc && git svn info "$(pwd)") >actual.info-pwd &&
grep -v ^Path: <expected.info-pwd >expected.info-np && grep -v ^Path: <expected.info-pwd >expected.info-np &&
grep -v ^Path: <actual.info-pwd >actual.info-np && grep -v ^Path: <actual.info-pwd >actual.info-np &&
test_cmp_info expected.info-np actual.info-np && test_cmp_info expected.info-np actual.info-np &&
@ -85,8 +85,8 @@ test_expect_success 'info $(pwd)' '
' '


test_expect_success 'info $(pwd)/../___wc' ' test_expect_success 'info $(pwd)/../___wc' '
(cd svnwc; svn info "$(pwd)/../svnwc") >expected.info-pwd && (cd svnwc && svn info "$(pwd)/../svnwc") >expected.info-pwd &&
(cd gitwc; git svn info "$(pwd)/../gitwc") >actual.info-pwd && (cd gitwc && git svn info "$(pwd)/../gitwc") >actual.info-pwd &&
grep -v ^Path: <expected.info-pwd >expected.info-np && grep -v ^Path: <expected.info-pwd >expected.info-np &&
grep -v ^Path: <actual.info-pwd >actual.info-np && grep -v ^Path: <actual.info-pwd >actual.info-np &&
test_cmp_info expected.info-np actual.info-np && test_cmp_info expected.info-np actual.info-np &&
@ -95,8 +95,8 @@ test_expect_success 'info $(pwd)/../___wc' '
' '


test_expect_success 'info $(pwd)/../___wc//file' ' test_expect_success 'info $(pwd)/../___wc//file' '
(cd svnwc; svn info "$(pwd)/../svnwc//file") >expected.info-pwd && (cd svnwc && svn info "$(pwd)/../svnwc//file") >expected.info-pwd &&
(cd gitwc; git svn info "$(pwd)/../gitwc//file") >actual.info-pwd && (cd gitwc && git svn info "$(pwd)/../gitwc//file") >actual.info-pwd &&
grep -v ^Path: <expected.info-pwd >expected.info-np && grep -v ^Path: <expected.info-pwd >expected.info-np &&
grep -v ^Path: <actual.info-pwd >actual.info-np && grep -v ^Path: <actual.info-pwd >actual.info-np &&
test_cmp_info expected.info-np actual.info-np && test_cmp_info expected.info-np actual.info-np &&
@ -105,56 +105,56 @@ test_expect_success 'info $(pwd)/../___wc//file' '
' '


test_expect_success 'info --url .' ' test_expect_success 'info --url .' '
test "$(cd gitwc; git svn info --url .)" = "$quoted_svnrepo" test "$(cd gitwc && git svn info --url .)" = "$quoted_svnrepo"
' '


test_expect_success 'info file' " test_expect_success 'info file' "
(cd svnwc; svn info file) > expected.info-file && (cd svnwc && svn info file) > expected.info-file &&
(cd gitwc; git svn info file) > actual.info-file && (cd gitwc && git svn info file) > actual.info-file &&
test_cmp_info expected.info-file actual.info-file test_cmp_info expected.info-file actual.info-file
" "


test_expect_success 'info --url file' ' test_expect_success 'info --url file' '
test "$(cd gitwc; git svn info --url file)" = "$quoted_svnrepo/file" test "$(cd gitwc && git svn info --url file)" = "$quoted_svnrepo/file"
' '


test_expect_success 'info directory' " test_expect_success 'info directory' "
(cd svnwc; svn info directory) > expected.info-directory && (cd svnwc && svn info directory) > expected.info-directory &&
(cd gitwc; git svn info directory) > actual.info-directory && (cd gitwc && git svn info directory) > actual.info-directory &&
test_cmp_info expected.info-directory actual.info-directory test_cmp_info expected.info-directory actual.info-directory
" "


test_expect_success 'info inside directory' " test_expect_success 'info inside directory' "
(cd svnwc/directory; svn info) > expected.info-inside-directory && (cd svnwc/directory && svn info) > expected.info-inside-directory &&
(cd gitwc/directory; git svn info) > actual.info-inside-directory && (cd gitwc/directory && git svn info) > actual.info-inside-directory &&
test_cmp_info expected.info-inside-directory actual.info-inside-directory test_cmp_info expected.info-inside-directory actual.info-inside-directory
" "


test_expect_success 'info --url directory' ' test_expect_success 'info --url directory' '
test "$(cd gitwc; git svn info --url directory)" = "$quoted_svnrepo/directory" test "$(cd gitwc && git svn info --url directory)" = "$quoted_svnrepo/directory"
' '


test_expect_success 'info symlink-file' " test_expect_success 'info symlink-file' "
(cd svnwc; svn info symlink-file) > expected.info-symlink-file && (cd svnwc && svn info symlink-file) > expected.info-symlink-file &&
(cd gitwc; git svn info symlink-file) > actual.info-symlink-file && (cd gitwc && git svn info symlink-file) > actual.info-symlink-file &&
test_cmp_info expected.info-symlink-file actual.info-symlink-file test_cmp_info expected.info-symlink-file actual.info-symlink-file
" "


test_expect_success 'info --url symlink-file' ' test_expect_success 'info --url symlink-file' '
test "$(cd gitwc; git svn info --url symlink-file)" \ test "$(cd gitwc && git svn info --url symlink-file)" \
= "$quoted_svnrepo/symlink-file" = "$quoted_svnrepo/symlink-file"
' '


test_expect_success 'info symlink-directory' " test_expect_success 'info symlink-directory' "
(cd svnwc; svn info symlink-directory) \ (cd svnwc && svn info symlink-directory) \
> expected.info-symlink-directory && > expected.info-symlink-directory &&
(cd gitwc; git svn info symlink-directory) \ (cd gitwc && git svn info symlink-directory) \
> actual.info-symlink-directory && > actual.info-symlink-directory &&
test_cmp_info expected.info-symlink-directory actual.info-symlink-directory test_cmp_info expected.info-symlink-directory actual.info-symlink-directory
" "


test_expect_success 'info --url symlink-directory' ' test_expect_success 'info --url symlink-directory' '
test "$(cd gitwc; git svn info --url symlink-directory)" \ test "$(cd gitwc && git svn info --url symlink-directory)" \
= "$quoted_svnrepo/symlink-directory" = "$quoted_svnrepo/symlink-directory"
' '


@ -169,13 +169,13 @@ test_expect_success 'info added-file' "
cd svnwc && cd svnwc &&
svn_cmd add added-file > /dev/null svn_cmd add added-file > /dev/null
) && ) &&
(cd svnwc; svn info added-file) > expected.info-added-file && (cd svnwc && svn info added-file) > expected.info-added-file &&
(cd gitwc; git svn info added-file) > actual.info-added-file && (cd gitwc && git svn info added-file) > actual.info-added-file &&
test_cmp_info expected.info-added-file actual.info-added-file test_cmp_info expected.info-added-file actual.info-added-file
" "


test_expect_success 'info --url added-file' ' test_expect_success 'info --url added-file' '
test "$(cd gitwc; git svn info --url added-file)" \ test "$(cd gitwc && git svn info --url added-file)" \
= "$quoted_svnrepo/added-file" = "$quoted_svnrepo/added-file"
' '


@ -190,15 +190,15 @@ test_expect_success 'info added-directory' "
cd gitwc && cd gitwc &&
git add added-directory git add added-directory
) && ) &&
(cd svnwc; svn info added-directory) \ (cd svnwc && svn info added-directory) \
> expected.info-added-directory && > expected.info-added-directory &&
(cd gitwc; git svn info added-directory) \ (cd gitwc && git svn info added-directory) \
> actual.info-added-directory && > actual.info-added-directory &&
test_cmp_info expected.info-added-directory actual.info-added-directory test_cmp_info expected.info-added-directory actual.info-added-directory
" "


test_expect_success 'info --url added-directory' ' test_expect_success 'info --url added-directory' '
test "$(cd gitwc; git svn info --url added-directory)" \ test "$(cd gitwc && git svn info --url added-directory)" \
= "$quoted_svnrepo/added-directory" = "$quoted_svnrepo/added-directory"
' '


@ -213,16 +213,16 @@ test_expect_success 'info added-symlink-file' "
ln -s added-file added-symlink-file && ln -s added-file added-symlink-file &&
svn_cmd add added-symlink-file > /dev/null svn_cmd add added-symlink-file > /dev/null
) && ) &&
(cd svnwc; svn info added-symlink-file) \ (cd svnwc && svn info added-symlink-file) \
> expected.info-added-symlink-file && > expected.info-added-symlink-file &&
(cd gitwc; git svn info added-symlink-file) \ (cd gitwc && git svn info added-symlink-file) \
> actual.info-added-symlink-file && > actual.info-added-symlink-file &&
test_cmp_info expected.info-added-symlink-file \ test_cmp_info expected.info-added-symlink-file \
actual.info-added-symlink-file actual.info-added-symlink-file
" "


test_expect_success 'info --url added-symlink-file' ' test_expect_success 'info --url added-symlink-file' '
test "$(cd gitwc; git svn info --url added-symlink-file)" \ test "$(cd gitwc && git svn info --url added-symlink-file)" \
= "$quoted_svnrepo/added-symlink-file" = "$quoted_svnrepo/added-symlink-file"
' '


@ -237,16 +237,16 @@ test_expect_success 'info added-symlink-directory' "
ln -s added-directory added-symlink-directory && ln -s added-directory added-symlink-directory &&
svn_cmd add added-symlink-directory > /dev/null svn_cmd add added-symlink-directory > /dev/null
) && ) &&
(cd svnwc; svn info added-symlink-directory) \ (cd svnwc && svn info added-symlink-directory) \
> expected.info-added-symlink-directory && > expected.info-added-symlink-directory &&
(cd gitwc; git svn info added-symlink-directory) \ (cd gitwc && git svn info added-symlink-directory) \
> actual.info-added-symlink-directory && > actual.info-added-symlink-directory &&
test_cmp_info expected.info-added-symlink-directory \ test_cmp_info expected.info-added-symlink-directory \
actual.info-added-symlink-directory actual.info-added-symlink-directory
" "


test_expect_success 'info --url added-symlink-directory' ' test_expect_success 'info --url added-symlink-directory' '
test "$(cd gitwc; git svn info --url added-symlink-directory)" \ test "$(cd gitwc && git svn info --url added-symlink-directory)" \
= "$quoted_svnrepo/added-symlink-directory" = "$quoted_svnrepo/added-symlink-directory"
' '


@ -259,13 +259,13 @@ test_expect_success 'info deleted-file' "
cd svnwc && cd svnwc &&
svn_cmd rm --force file > /dev/null svn_cmd rm --force file > /dev/null
) && ) &&
(cd svnwc; svn info file) >expected.info-deleted-file && (cd svnwc && svn info file) >expected.info-deleted-file &&
(cd gitwc; git svn info file) >actual.info-deleted-file && (cd gitwc && git svn info file) >actual.info-deleted-file &&
test_cmp_info expected.info-deleted-file actual.info-deleted-file test_cmp_info expected.info-deleted-file actual.info-deleted-file
" "


test_expect_success 'info --url file (deleted)' ' test_expect_success 'info --url file (deleted)' '
test "$(cd gitwc; git svn info --url file)" \ test "$(cd gitwc && git svn info --url file)" \
= "$quoted_svnrepo/file" = "$quoted_svnrepo/file"
' '


@ -278,13 +278,13 @@ test_expect_success 'info deleted-directory' "
cd svnwc && cd svnwc &&
svn_cmd rm --force directory > /dev/null svn_cmd rm --force directory > /dev/null
) && ) &&
(cd svnwc; svn info directory) >expected.info-deleted-directory && (cd svnwc && svn info directory) >expected.info-deleted-directory &&
(cd gitwc; git svn info directory) >actual.info-deleted-directory && (cd gitwc && git svn info directory) >actual.info-deleted-directory &&
test_cmp_info expected.info-deleted-directory actual.info-deleted-directory test_cmp_info expected.info-deleted-directory actual.info-deleted-directory
" "


test_expect_success 'info --url directory (deleted)' ' test_expect_success 'info --url directory (deleted)' '
test "$(cd gitwc; git svn info --url directory)" \ test "$(cd gitwc && git svn info --url directory)" \
= "$quoted_svnrepo/directory" = "$quoted_svnrepo/directory"
' '


@ -297,13 +297,13 @@ test_expect_success 'info deleted-symlink-file' "
cd svnwc && cd svnwc &&
svn_cmd rm --force symlink-file > /dev/null svn_cmd rm --force symlink-file > /dev/null
) && ) &&
(cd svnwc; svn info symlink-file) >expected.info-deleted-symlink-file && (cd svnwc && svn info symlink-file) >expected.info-deleted-symlink-file &&
(cd gitwc; git svn info symlink-file) >actual.info-deleted-symlink-file && (cd gitwc && git svn info symlink-file) >actual.info-deleted-symlink-file &&
test_cmp_info expected.info-deleted-symlink-file actual.info-deleted-symlink-file test_cmp_info expected.info-deleted-symlink-file actual.info-deleted-symlink-file
" "


test_expect_success 'info --url symlink-file (deleted)' ' test_expect_success 'info --url symlink-file (deleted)' '
test "$(cd gitwc; git svn info --url symlink-file)" \ test "$(cd gitwc && git svn info --url symlink-file)" \
= "$quoted_svnrepo/symlink-file" = "$quoted_svnrepo/symlink-file"
' '


@ -316,13 +316,13 @@ test_expect_success 'info deleted-symlink-directory' "
cd svnwc && cd svnwc &&
svn_cmd rm --force symlink-directory > /dev/null svn_cmd rm --force symlink-directory > /dev/null
) && ) &&
(cd svnwc; svn info symlink-directory) >expected.info-deleted-symlink-directory && (cd svnwc && svn info symlink-directory) >expected.info-deleted-symlink-directory &&
(cd gitwc; git svn info symlink-directory) >actual.info-deleted-symlink-directory && (cd gitwc && git svn info symlink-directory) >actual.info-deleted-symlink-directory &&
test_cmp_info expected.info-deleted-symlink-directory actual.info-deleted-symlink-directory test_cmp_info expected.info-deleted-symlink-directory actual.info-deleted-symlink-directory
" "


test_expect_success 'info --url symlink-directory (deleted)' ' test_expect_success 'info --url symlink-directory (deleted)' '
test "$(cd gitwc; git svn info --url symlink-directory)" \ test "$(cd gitwc && git svn info --url symlink-directory)" \
= "$quoted_svnrepo/symlink-directory" = "$quoted_svnrepo/symlink-directory"
' '


@ -331,27 +331,27 @@ test_expect_success 'info --url symlink-directory (deleted)' '


test_expect_success 'info unknown-file' " test_expect_success 'info unknown-file' "
echo two > gitwc/unknown-file && echo two > gitwc/unknown-file &&
(cd gitwc; test_must_fail git svn info unknown-file) \ (cd gitwc && test_must_fail git svn info unknown-file) \
2> actual.info-unknown-file && 2> actual.info-unknown-file &&
grep unknown-file actual.info-unknown-file grep unknown-file actual.info-unknown-file
" "


test_expect_success 'info --url unknown-file' ' test_expect_success 'info --url unknown-file' '
echo two > gitwc/unknown-file && echo two > gitwc/unknown-file &&
(cd gitwc; test_must_fail git svn info --url unknown-file) \ (cd gitwc && test_must_fail git svn info --url unknown-file) \
2> actual.info-url-unknown-file && 2> actual.info-url-unknown-file &&
grep unknown-file actual.info-url-unknown-file grep unknown-file actual.info-url-unknown-file
' '


test_expect_success 'info unknown-directory' " test_expect_success 'info unknown-directory' "
mkdir gitwc/unknown-directory svnwc/unknown-directory && mkdir gitwc/unknown-directory svnwc/unknown-directory &&
(cd gitwc; test_must_fail git svn info unknown-directory) \ (cd gitwc && test_must_fail git svn info unknown-directory) \
2> actual.info-unknown-directory && 2> actual.info-unknown-directory &&
grep unknown-directory actual.info-unknown-directory grep unknown-directory actual.info-unknown-directory
" "


test_expect_success 'info --url unknown-directory' ' test_expect_success 'info --url unknown-directory' '
(cd gitwc; test_must_fail git svn info --url unknown-directory) \ (cd gitwc && test_must_fail git svn info --url unknown-directory) \
2> actual.info-url-unknown-directory && 2> actual.info-url-unknown-directory &&
grep unknown-directory actual.info-url-unknown-directory grep unknown-directory actual.info-url-unknown-directory
' '
@ -361,13 +361,13 @@ test_expect_success 'info unknown-symlink-file' "
cd gitwc && cd gitwc &&
ln -s unknown-file unknown-symlink-file ln -s unknown-file unknown-symlink-file
) && ) &&
(cd gitwc; test_must_fail git svn info unknown-symlink-file) \ (cd gitwc && test_must_fail git svn info unknown-symlink-file) \
2> actual.info-unknown-symlink-file && 2> actual.info-unknown-symlink-file &&
grep unknown-symlink-file actual.info-unknown-symlink-file grep unknown-symlink-file actual.info-unknown-symlink-file
" "


test_expect_success 'info --url unknown-symlink-file' ' test_expect_success 'info --url unknown-symlink-file' '
(cd gitwc; test_must_fail git svn info --url unknown-symlink-file) \ (cd gitwc && test_must_fail git svn info --url unknown-symlink-file) \
2> actual.info-url-unknown-symlink-file && 2> actual.info-url-unknown-symlink-file &&
grep unknown-symlink-file actual.info-url-unknown-symlink-file grep unknown-symlink-file actual.info-url-unknown-symlink-file
' '
@ -377,13 +377,13 @@ test_expect_success 'info unknown-symlink-directory' "
cd gitwc && cd gitwc &&
ln -s unknown-directory unknown-symlink-directory ln -s unknown-directory unknown-symlink-directory
) && ) &&
(cd gitwc; test_must_fail git svn info unknown-symlink-directory) \ (cd gitwc && test_must_fail git svn info unknown-symlink-directory) \
2> actual.info-unknown-symlink-directory && 2> actual.info-unknown-symlink-directory &&
grep unknown-symlink-directory actual.info-unknown-symlink-directory grep unknown-symlink-directory actual.info-unknown-symlink-directory
" "


test_expect_success 'info --url unknown-symlink-directory' ' test_expect_success 'info --url unknown-symlink-directory' '
(cd gitwc; test_must_fail git svn info --url unknown-symlink-directory) \ (cd gitwc && test_must_fail git svn info --url unknown-symlink-directory) \
2> actual.info-url-unknown-symlink-directory && 2> actual.info-url-unknown-symlink-directory &&
grep unknown-symlink-directory actual.info-url-unknown-symlink-directory grep unknown-symlink-directory actual.info-url-unknown-symlink-directory
' '