Re: [PATCH v2] git-notes: Run partial expensive test everywhere

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 24, 2010, 07:14 UTC
Message-ID: <20100824071453.GA3064@burratino>
In-Reply-To: <AANLkTikfwbtKt2WrxzRyKHnP3ySGtBF33=z_rJwjPx5Y@mail.gmail.com>

Ævar Arnfjörð Bjarmason wrote:

> It turns out that this fails on Solaris because its /usr/bin/time is different.

Odd. Different how? As far as I can tell, all that test asks of time is to execv() its arguments and pass on a 0 exit status.

Ah, maybe this is it: perhaps /usr/bin/time sh runs /bin/sh. Does the following help?

Patch is against next.  Untested except on Linux where it wouldn't
make a difference.
-- 8< --
Subject: t3302 (notes): Port to Solaris

The time_notes script, which uses POSIX shell features, is currently sometimes run with a non-POSIX /bin/sh.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 7c08e99..e35d781 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -96,7 +96,7 @@ time_notes () {
 	for mode in no-notes notes
 	do
 		echo $mode
-		/usr/bin/time sh ../time_notes $mode $1
+		/usr/bin/time "$SHELL_PATH" ../time_notes $mode $1
 	done
 }