Skip to content

Commit d94447d

Browse files
committed
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
2 parents 7889179 + eb8e364 commit d94447d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

t/t9815-git-p4-submit-fail.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,8 @@ test_expect_success 'cleanup chmod after submit cancel' '
417417
! p4 fstat -T action text &&
418418
test_path_is_file text+x &&
419419
! p4 fstat -T action text+x &&
420-
if test_have_prereq !CYGWIN
421-
then
422-
stat --format=%A text | egrep ^-r-- &&
423-
stat --format=%A text+x | egrep ^-r-x
424-
fi
420+
ls -l text | egrep ^-r-- &&
421+
ls -l text+x | egrep ^-r-x
425422
)
426423
'
427424

t/t9819-git-p4-case-folding.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ test_description='interaction with P4 case-folding'
44

55
. ./lib-git-p4.sh
66

7+
if test_have_prereq CASE_INSENSITIVE_FS
8+
then
9+
skip_all='skipping P4 case-folding tests; case insensitive file system detected'
10+
test_done
11+
fi
12+
713
test_expect_success 'start p4d with case folding enabled' '
814
start_p4d -C1
915
'

0 commit comments

Comments
 (0)