1 Return-Path: <thomas@schwinge.name>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 62685431FB6
\r
6 for <notmuch@notmuchmail.org>; Wed, 2 Feb 2011 10:17:54 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 91fhkh4SSTUF for <notmuch@notmuchmail.org>;
\r
16 Wed, 2 Feb 2011 10:17:53 -0800 (PST)
\r
17 Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de
\r
19 by olra.theworths.org (Postfix) with ESMTP id 510B9431FB5
\r
20 for <notmuch@notmuchmail.org>; Wed, 2 Feb 2011 10:17:53 -0800 (PST)
\r
21 Received: from [87.180.46.33] (helo=stokes.schwinge.homeip.net)
\r
22 by smtprelay03.ispgateway.de with esmtpa (Exim 4.68)
\r
23 (envelope-from <thomas@schwinge.name>) id 1PkhH4-0006EB-F6
\r
24 for notmuch@notmuchmail.org; Wed, 02 Feb 2011 19:17:50 +0100
\r
25 Received: (qmail 3414 invoked from network); 2 Feb 2011 18:17:23 -0000
\r
26 Received: from schwinge.homeip.net (87.180.46.33)
\r
27 by stokes.schwinge.homeip.net with QMQP; 2 Feb 2011 18:17:23 -0000
\r
28 Received: (nullmailer pid 27741 invoked by uid 1000);
\r
29 Wed, 02 Feb 2011 18:17:21 -0000
\r
30 From: Thomas Schwinge <thomas@schwinge.name>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] Shell programming: directories are ``executable'' (that is,
\r
34 Date: Wed, 2 Feb 2011 19:17:09 +0100
\r
35 Message-Id: <1296670629-27711-1-git-send-email-thomas@schwinge.name>
\r
36 X-Mailer: git-send-email 1.7.1
\r
37 X-Df-Sender: thomas@schwinge.name
\r
38 Cc: Thomas Schwinge <thomas@schwinge.name>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Wed, 02 Feb 2011 18:17:54 -0000
\r
53 Signed-off-by: Thomas Schwinge <thomas@schwinge.name>
\r
55 test/test-lib.sh | 5 +++--
\r
56 1 files changed, 3 insertions(+), 2 deletions(-)
\r
58 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
59 index f536172..3471ead 100755
\r
60 --- a/test/test-lib.sh
\r
61 +++ b/test/test-lib.sh
\r
62 @@ -815,13 +815,14 @@ EOF
\r
66 +# Locate the directory containing the `notmuch' executable we are to use.
\r
67 find_notmuch_path ()
\r
71 while [ -n "$dir" ]; do
\r
73 - if [ -x "$bin" ]; then
\r
74 + if [ -f "$bin" -a -x "$bin" ]; then
\r
78 @@ -858,7 +859,7 @@ then
\r
80 make_valgrind_symlink () {
\r
81 # handle only executables
\r
82 - test -x "$1" || return
\r
83 + test -f "$1" -a -x "$1" || return
\r
85 base=$(basename "$1")
\r
86 symlink_target=$TEST_DIRECTORY/../$base
\r