development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ls/p4-test-updates'

Browse source 
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:
Junio C Hamano 2015-10-20 15:26:09 -07:00
parent 78891795df eb8e364969
commit d94447d3b6
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
t/t9815-git-p4-submit-fail.sh
View file

@ -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
)
'

6
t/t9819-git-p4-case-folding.sh
View file

@ -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
'