git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Brandon Casey <casey@nrlssc.navy.mil>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Brandon Casey <drafnel@gmail.com>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 4/5] t/t7006: ignore return status of shell's unset builtin
Date: Tue,  1 Jun 2010 19:13:43 -0500	[thread overview]
Message-ID: <Wt_M4qptcPdpY0Q3jqUbfMMZpuKZEHudj8tavRDS41LEhIuAY6Jac5ja0dD0ZRTTyKV_0v7MM6g@cipher.nrlssc.navy.mil> (raw)
In-Reply-To: <Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil>

From: Brandon Casey <drafnel@gmail.com>

The unset builtin of Solaris's xpg4/sh returns non-zero if it is passed a
variable name which was not previously set.  Since the unset is not likely
to fail, ignore it's return status.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---
 t/t7006-pager.sh |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 3bc7a2a..a82bfb1 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -40,7 +40,7 @@ else
 fi
 
 test_expect_success 'setup' '
-	unset GIT_PAGER GIT_PAGER_IN_USE &&
+	unset GIT_PAGER GIT_PAGER_IN_USE
 	test_might_fail git config --unset core.pager &&
 
 	PAGER="cat >paginated.out" &&
@@ -159,7 +159,7 @@ test_expect_success 'color when writing to a file intended for a pager' '
 '
 
 test_expect_success 'determine default pager' '
-	unset PAGER GIT_PAGER &&
+	unset PAGER GIT_PAGER
 	test_might_fail git config --unset core.pager ||
 	cleanup_fail &&
 
@@ -173,7 +173,7 @@ then
 fi
 
 test_expect_success SIMPLEPAGER 'default pager is used by default' '
-	unset PAGER GIT_PAGER &&
+	unset PAGER GIT_PAGER
 	test_might_fail git config --unset core.pager &&
 	rm -f default_pager_used ||
 	cleanup_fail &&
@@ -192,7 +192,7 @@ test_expect_success SIMPLEPAGER 'default pager is used by default' '
 '
 
 test_expect_success TTY 'PAGER overrides default pager' '
-	unset GIT_PAGER &&
+	unset GIT_PAGER
 	test_might_fail git config --unset core.pager &&
 	rm -f PAGER_used ||
 	cleanup_fail &&
@@ -204,7 +204,7 @@ test_expect_success TTY 'PAGER overrides default pager' '
 '
 
 test_expect_success TTY 'core.pager overrides PAGER' '
-	unset GIT_PAGER &&
+	unset GIT_PAGER
 	rm -f core.pager_used ||
 	cleanup_fail &&
 
-- 
1.6.6.2

  parent reply	other threads:[~2010-06-02  0:14 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-02  0:13 [PATCH 0/5] miscellaneous test suite fixes Brandon Casey
2010-06-02  0:13 ` [PATCH 1/5] t/t5800: skip if python version is older than 2.5 Brandon Casey
2010-06-02  6:21   ` Sverre Rabbelier
2010-06-02  9:33     ` Ævar Arnfjörð Bjarmason
2010-06-02 14:44     ` Brandon Casey
2010-06-02 15:15       ` Brandon Casey
2010-06-02 16:38         ` Sverre Rabbelier
2010-06-02 16:50           ` Brandon Casey
2010-06-02 23:23     ` test suite work-around for python 2.5 requirement Brandon Casey
2010-06-02 23:23     ` [PATCH 1/2] Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS Brandon Casey
2010-06-02 23:23     ` [PATCH 2/2] t/t5800: skip if python version is older than 2.5 Brandon Casey
2010-08-17 23:15       ` Sverre Rabbelier
2010-08-17 23:28         ` Jonathan Nieder
2010-08-17 23:32           ` Sverre Rabbelier
2010-08-17 23:37             ` Jonathan Nieder
2010-08-18  0:10               ` Sverre Rabbelier
2010-08-18  2:37                 ` Brandon Casey
2010-06-02  6:37   ` [PATCH 1/5] " Johannes Sixt
2010-06-02 14:46     ` Brandon Casey
2010-06-02  0:13 ` [PATCH 2/5] git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh Brandon Casey
2010-06-02  4:30   ` Jonathan Nieder
2010-06-02 14:21     ` Brandon Casey
2010-06-02 23:37       ` Junio C Hamano
2010-06-02  0:13 ` [PATCH 3/5] t/t5150: remove space from sed script Brandon Casey
2010-06-02  4:12   ` Jonathan Nieder
2010-06-02  0:13 ` Brandon Casey [this message]
2010-06-02  5:47   ` [PATCH 4/5] t/t7006: ignore return status of shell's unset builtin Jonathan Nieder
2010-06-02  6:41   ` Johannes Sixt
2010-06-02 14:47     ` Brandon Casey
2010-06-02 15:32       ` [PATCH 4/5 v2] " Brandon Casey
2010-06-02  0:13 ` [PATCH 5/5] t/aggregate-results: accomodate systems with small max argument list length Brandon Casey

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=Wt_M4qptcPdpY0Q3jqUbfMMZpuKZEHudj8tavRDS41LEhIuAY6Jac5ja0dD0ZRTTyKV_0v7MM6g@cipher.nrlssc.navy.mil \
    --to=casey@nrlssc.navy.mil \
    --cc=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    /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).