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

git p4 test: use test_chmod for cygwin 

This test does a commit that is a pure mode change, submits
it to p4 but causes the submit to fail.  It verifies that
the state in p4 as well as the client directory are both
unmodified after the failed submit.

On cygwin, "chmod +x" does nothing, so use the test_chmod
function to modify the index directly too.

Also on cygwin, the executable bit cannot be seen in the
filesystem, so avoid that part of the test.  The checks of
p4 state are still valid, though.

Thanks-to: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Pete Wyckoff 2013-01-26 22:11:18 -05:00 committed by Junio C Hamano
parent e9df0f9c7a
commit 4cea4d6608
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t9815-git-p4-submit-fail.sh
View File

@ -405,8 +405,8 @@ test_expect_success 'cleanup chmod after submit cancel' '
git p4 clone --dest="$git" //depot && git p4 clone --dest="$git" //depot &&
( (
cd "$git" && cd "$git" &&
chmod u+x text && test_chmod +x text &&
chmod u-x text+x && test_chmod -x text+x &&
git add text text+x && git add text text+x &&
git commit -m "chmod texts" && git commit -m "chmod texts" &&
echo n | test_expect_code 1 git p4 submit echo n | test_expect_code 1 git p4 submit
@ -415,10 +415,13 @@ test_expect_success 'cleanup chmod after submit cancel' '
cd "$cli" && cd "$cli" &&
test_path_is_file text && test_path_is_file text &&
! p4 fstat -T action text && ! p4 fstat -T action text &&
stat --format=%A text | egrep ^-r-- &&
test_path_is_file text+x && test_path_is_file text+x &&
! p4 fstat -T action text+x && ! p4 fstat -T action text+x &&
stat --format=%A text+x | egrep ^-r-x if test_have_prereq NOT_CYGWIN
then
stat --format=%A text | egrep ^-r-- &&
stat --format=%A text+x | egrep ^-r-x
fi
) )
' '