diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-21 01:26:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-21 01:26:09 +0300 |
| commit | d94447d3b636d51cc95cf2d2d9e9d3facd3b4fee (patch) | |
| tree | 099a62bc4b5ca6e205fae2b74982354e11cf6c1a /t | |
| parent | 78891795df91a313fac590dd6cff9d8aace0dc9a (diff) | |
| parent | eb8e364969098e92743024dca170d1db3536a978 (diff) | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9815-git-p4-submit-fail.sh | 7 | ||||
| -rwxr-xr-x | t/t9819-git-p4-case-folding.sh | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh index 4cff6a760f..37b42d03a2 100755 --- a/t/t9815-git-p4-submit-fail.sh +++ b/t/t9815-git-p4-submit-fail.sh @@ -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 ) ' diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh index 78f1d0f92d..d808c008c1 100755 --- a/t/t9819-git-p4-case-folding.sh +++ b/t/t9819-git-p4-case-folding.sh @@ -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 ' |