Merge branch 'ls/p4-test-updates'
A few test scripts around "git p4" have been improved for portability. * ls/p4-test-updates: git-p4: skip t9819 test case on case insensitive file systems git-p4: avoid "stat" command in t9815 git-p4-submit-fail
This commit is contained in:
commit
d94447d3b6
@ -417,11 +417,8 @@ test_expect_success 'cleanup chmod after submit cancel' '
|
||||
! p4 fstat -T action text &&
|
||||
test_path_is_file text+x &&
|
||||
! p4 fstat -T action text+x &&
|
||||
if test_have_prereq !CYGWIN
|
||||
then
|
||||
stat --format=%A text | egrep ^-r-- &&
|
||||
stat --format=%A text+x | egrep ^-r-x
|
||||
fi
|
||||
ls -l text | egrep ^-r-- &&
|
||||
ls -l text+x | egrep ^-r-x
|
||||
)
|
||||
'
|
||||
|
||||
|
@ -4,6 +4,12 @@ test_description='interaction with P4 case-folding'
|
||||
|
||||
. ./lib-git-p4.sh
|
||||
|
||||
if test_have_prereq CASE_INSENSITIVE_FS
|
||||
then
|
||||
skip_all='skipping P4 case-folding tests; case insensitive file system detected'
|
||||
test_done
|
||||
fi
|
||||
|
||||
test_expect_success 'start p4d with case folding enabled' '
|
||||
start_p4d -C1
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user