[PATCH v2 8/9] test/atomicity: use a more portable 'cp' form

diff --git a/e8/47eeb64c9f7cb3ab10441f9d95e466d086ea03 b/e8/47eeb64c9f7cb3ab10441f9d95e466d086ea03
new file mode 100644 (file)
index 0000000..5c9c4a9
--- /dev/null
+++ b/e8/47eeb64c9f7cb3ab10441f9d95e466d086ea03
@@ -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 B989B431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:58 -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 XUW6iSrWvxBl for <notmuch@notmuchmail.org>;\r
+       Wed, 30 May 2012 00:02:58 -0700 (PDT)\r
+Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com\r
+       [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9371E431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:56 -0700 (PDT)\r
+Received: by mail-vc0-f181.google.com with SMTP id f1so4187995vcb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:56 -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=lLBJEmUAeUvv+iYKSiGgs8OvB+5gWhrgISljBGYtthEEM//CDX0HgOFxl3/LmxfmgH\r
+       Ht1JBlrR101HYNNZaiD5aNhROWeu2siE/lQd2btPsj6LtqIzZFh79buMbsMN62dGV/2A\r
+       ucmK5djtUs3ZlaFqJMwl4Eg8lk86uciQmq/1BVoE2tTEPYj7yCuEJhKeYrxIP11DvWJo\r
+       P3obzDnxzs3yXg3gEOAZo6rPeejVfW/0ToE5QrqeUHKIWpu61VmmlYQEYXe2ErnnGAHe\r
+       DBAF7fT3fyXirRkhfSHSFEK14zMv+3gKqK/aI6Dfj6X7RxxZf4CP+Q0oYtqgxco9t8jW\r
+       nkdQ==\r
+Received: by 10.220.240.147 with SMTP id la19mr15888020vcb.47.1338361376220;\r
+       Wed, 30 May 2012 00:02:56 -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 o3sm28335297vdj.1.2012.05.30.00.02.55\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 30 May 2012 00:02:55 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 69335287DE; Wed, 30 May 2012 03:02:54 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 8/9] test/atomicity: use a more portable 'cp' form\r
+Date: Wed, 30 May 2012 03:02:03 -0400\r
+Message-Id: <1338361324-57289-9-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+References: <1338361324-57289-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmfX1I5sxBBhxa8dIsz1qHyTn7pegMzVd4le9pxBWq2KPNm3jc/UoeKQaJMS6E/qtOIs6T7\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: Wed, 30 May 2012 07:02:59 -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