git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: luke@diamand.org, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v2 3/4] git-p4: Fix t9815 git-p4-submit-fail test case on OS X
Date: Sun,  4 Oct 2015 11:06:16 -0700	[thread overview]
Message-ID: <1443981977-64604-4-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1443981977-64604-1-git-send-email-larsxschneider@gmail.com>

From: Lars Schneider <larsxschneider@gmail.com>

The stats command works differently on OS X compared to Linux. Detect
OS X and execute the appropriate assertions.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
 t/t9815-git-p4-submit-fail.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 4cff6a7..520b812 100755
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -417,8 +417,12 @@ 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
+		if test_have_prereq CYGWIN; then
+			: # NOOP
+		elif test_have_prereq DARWIN; then
+			stat -f %Sp text | egrep ^-r-- &&
+			stat -f %Sp text+x | egrep ^-r-x
+		else
 			stat --format=%A text | egrep ^-r-- &&
 			stat --format=%A text+x | egrep ^-r-x
 		fi
-- 
2.5.1

  parent reply	other threads:[~2015-10-04 18:06 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-04 18:06 [PATCH v2 0/4] Add Travis CI support larsxschneider
2015-10-04 18:06 ` [PATCH v2 1/4] " larsxschneider
2015-10-05  9:43   ` Johannes Schindelin
2015-10-04 18:06 ` [PATCH v2 2/4] Add prereq to detect OS X larsxschneider
2015-10-04 18:28   ` Junio C Hamano
2015-10-04 18:46     ` Lars Schneider
2015-10-04 18:06 ` larsxschneider [this message]
2015-10-04 18:23   ` [PATCH v2 3/4] git-p4: Fix t9815 git-p4-submit-fail test case on " Junio C Hamano
2015-10-04 18:44     ` Lars Schneider
2015-10-04 20:18       ` Pete Wyckoff
2015-10-05  3:08   ` Torsten Bögershausen
2015-10-04 18:06 ` [PATCH v2 4/4] git-p4: Disable t9819 git-p4-case-folding test " larsxschneider
2015-10-04 18:26   ` Junio C Hamano
2015-10-04 18:38     ` Lars Schneider
2015-10-04 18:49       ` Junio C Hamano
2015-10-05  9:55 ` [PATCH v2 0/4] Add Travis CI support Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443981977-64604-4-git-send-email-larsxschneider@gmail.com \
    --to=larsxschneider@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=luke@diamand.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).