From 23d9098e97bed1a29b57ccbeec67b1ddbacead5a Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Thu, 31 May 2012 03:02:01 +2000 Subject: [PATCH] [PATCH v2 6/9] test/basic: use portable args for find --- b7/1dc79313515e27d1c883c33cea8c21be804408 | 91 +++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 b7/1dc79313515e27d1c883c33cea8c21be804408 diff --git a/b7/1dc79313515e27d1c883c33cea8c21be804408 b/b7/1dc79313515e27d1c883c33cea8c21be804408 new file mode 100644 index 000000000..c259f1a86 --- /dev/null +++ b/b7/1dc79313515e27d1c883c33cea8c21be804408 @@ -0,0 +1,91 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 71F10431FD2 + for ; Wed, 30 May 2012 00:02:57 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id iIvUuWd7H9F2 for ; + Wed, 30 May 2012 00:02:56 -0700 (PDT) +Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com + [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A0010431FB6 + for ; Wed, 30 May 2012 00:02:55 -0700 (PDT) +Received: by mail-vb0-f53.google.com with SMTP id fc26so4786696vbb.26 + for ; Wed, 30 May 2012 00:02:55 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :x-gm-message-state; + bh=2a8MXT7BpIEEWNOpxV4k0odz/6TgNyIf2zZ4PfhdVZ0=; + b=N3Ko6XjwbW4ZoglyyvDr/thBHGEC1hYXjMWNH4QpMu/GUY0m+wd1RQILlbcoPbQPqA + SXtXTubO8sH6peOB5ef1kGPNGUYbY/8/wNs/I3GyRlVx5GuZRRVfu0SfJNASWg61KmAA + 9c70+Lm0QbxrtLFBzqWPNFQQnGhMGI/WPWb4hOaa2LLafizAut6v8Hd6ls4JeCwZ3WkO + uAR+uHwTrwOaRKk98SCUwrnx79xtRrZbH5+eGoS3FPRFA5H5XRPOfkPH5n7n9dZBQd8J + ddcXnBoGwPVqyQ4muRzSsiwsjSIKHsp0JnMDQeiHr6jHQ9h6er+MsclFbz5k+p9cDafT + aBwA== +Received: by 10.220.153.75 with SMTP id j11mr15993103vcw.32.1338361375265; + Wed, 30 May 2012 00:02:55 -0700 (PDT) +Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net. + [71.182.155.97]) + by mx.google.com with ESMTPS id c17sm28321669vdj.11.2012.05.30.00.02.54 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 30 May 2012 00:02:54 -0700 (PDT) +Received: by nas.home.pioto.org (Postfix, from userid 1001) + id BBBA0287D2; Wed, 30 May 2012 03:02:53 -0400 (EDT) +From: Mike Kelly +To: notmuch@notmuchmail.org +Subject: [PATCH v2 6/9] test/basic: use portable args for find +Date: Wed, 30 May 2012 03:02:01 -0400 +Message-Id: <1338361324-57289-7-git-send-email-pioto@pioto.org> +X-Mailer: git-send-email 1.7.10.2 +In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org> +References: <1338361324-57289-1-git-send-email-pioto@pioto.org> +X-Gm-Message-State: + ALoCoQlRegRYb89fmAgTDr/pCHb7V7P1C4M/cL7IlS1J2SJiiNeL8qvo6BjiSy2TZESAzmPrBbP8 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 30 May 2012 07:02:57 -0000 + +`-executable` isn't available in FreeBSD's version of find, so use a +more portable version, `-perm +111`. +--- + test/basic | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/basic b/test/basic +index d6aed24..3b635c8 100755 +--- a/test/basic ++++ b/test/basic +@@ -53,8 +53,8 @@ test_expect_code 2 'failure to clean up causes the test to fail' ' + test_begin_subtest 'Ensure that all available tests will be run by notmuch-test' + eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test) + tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) +-available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \ +- sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \ ++available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \ ++ sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \ + sort) + test_expect_equal "$tests_in_suite" "$available" + +-- +1.7.10.2 + -- 2.26.2