[PATCH 08/10] test/atomicity: use a more portable 'cp' form

diff --git a/1a/0229e1973ec4918e8aa8525c742ad0f2312af9 b/1a/0229e1973ec4918e8aa8525c742ad0f2312af9
new file mode 100644 (file)
index 0000000..f63befa
--- /dev/null
+++ b/1a/0229e1973ec4918e8aa8525c742ad0f2312af9
@@ -0,0 +1,92 @@
+Return-Path: <pioto@pioto.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D3D47431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Q4sVCOlIyhhh for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 06:44:11 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C117E431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:10 -0700 (PDT)\r
+Received: by mail-vb0-f53.google.com with SMTP id fc26so989685vbb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:10 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=wqnCBTyD2FpJpDCZPSty5r/Hr3FLgWi1C1GsJLz5yzA=;\r
+       b=cQ0AvEvVjzrxad5nsRP8N0tgQJmJhBRueZiYwt1PWS9th0/5DXpVN0001JUEy+DWTR\r
+       aDvtpErsXtJVipO6vv+Uti7WZEcq1uA9G0oFDkDUSR+Xdk0OGDm8H1mA5F2g7Xa00jf2\r
+       0vHCgGomBK2ycZLLjSr9byzR5BWtwTcSf75rn6HkNz0m2UDmUvtFwHHoon9noL7ObdnE\r
+       cwb5XY4RyBVYuIldG+hEhEkCbfrMV0mRAVkOIhZ9Y6FsWbSVgHWxsLC6pSPl/Ps6dbqk\r
+       hDbTlVjCKbpC7XPaQL5b0Sr9IXIjngogyw3Mtt9WVLYDnq0DT+OgMtiGwjZodA+bIwYa\r
+       ZkCQ==\r
+Received: by 10.220.222.74 with SMTP id if10mr3693187vcb.27.1337953450589;\r
+       Fri, 25 May 2012 06:44:10 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id i19sm4238346vdj.13.2012.05.25.06.44.10\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 06:44:10 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 801BB287D5; Fri, 25 May 2012 09:44:09 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 08/10] test/atomicity: use a more portable 'cp' form\r
+Date: Fri, 25 May 2012 09:43:29 -0400\r
+Message-Id: <1337953411-21000-9-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnxkjhGJSEpFAt4Gv3adcvAyB7W6QDuXn6gKUibYy44FrPjUOLglHNglVnztzoy/d6XUB6y\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 25 May 2012 13:44:12 -0000\r
+\r
+-a already implies -r/-R, so no need for both.\r
+\r
+FreeBSD's cp complains:\r
+\r
+  cp: the -R and -r options may not be specified together\r
+---\r
+ test/atomicity |    2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/atomicity b/test/atomicity\r
+index 6df0a00..1c786fa 100755\r
+--- a/test/atomicity\r
++++ b/test/atomicity\r
+@@ -51,7 +51,7 @@ if test_require_external_prereq gdb; then\r
+ \r
+     # Prepare a snapshot of the updated maildir.  The gdb script will\r
+     # update the database in this snapshot as it goes.\r
+-    cp -ra $MAIL_DIR $MAIL_DIR.snap\r
++    cp -a $MAIL_DIR $MAIL_DIR.snap\r
+     cp ${NOTMUCH_CONFIG} ${NOTMUCH_CONFIG}.snap\r
+     NOTMUCH_CONFIG=${NOTMUCH_CONFIG}.snap notmuch config set database.path $MAIL_DIR.snap\r
+ \r
+-- \r
+1.7.10.2\r
+\r