From 3a692b3c87e5433ab0a98f1307486c9956408e30 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Mon, 12 Oct 2015 10:03:03 -0700 Subject: git-p4: avoid "stat" command in t9815 git-p4-submit-fail Replace the stat command with the ls command to check file mode bits. The stats command is not available on Windows and has different command line options on OS X. Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- t/t9815-git-p4-submit-fail.sh | 7 ++----- 1 file changed, 2 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 ) ' -- cgit v1.2.3 From eb8e364969098e92743024dca170d1db3536a978 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Mon, 12 Oct 2015 10:03:04 -0700 Subject: git-p4: skip t9819 test case on case insensitive file systems Windows and OS X file systems are case insensitive by default. Consequently the "git-p4-case-folding" test case does not apply to them. Signed-off-by: Lars Schneider Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- t/t9819-git-p4-case-folding.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 ' -- cgit v1.2.3