From: Mike Kelly <pioto@pioto.org>
Date: Wed, 30 May 2012 07:02:03 +0000 (-0400)
Subject: test/atomicity: use a more portable 'cp' form
X-Git-Tag: 0.15_rc1~248
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79a73cd46e39be5cc83c0805ac2b2c20a81d64c8;p=notmuch.git

test/atomicity: use a more portable 'cp' form

-a already implies -r/-R, so no need for both.

FreeBSD's cp complains:

  cp: the -R and -r options may not be specified together
---

diff --git a/test/atomicity b/test/atomicity
index 6df0a00e..1c786fa2 100755
--- a/test/atomicity
+++ b/test/atomicity
@@ -51,7 +51,7 @@ if test_require_external_prereq gdb; then
 
     # Prepare a snapshot of the updated maildir.  The gdb script will
     # update the database in this snapshot as it goes.
-    cp -ra $MAIL_DIR $MAIL_DIR.snap
+    cp -a $MAIL_DIR $MAIL_DIR.snap
     cp ${NOTMUCH_CONFIG} ${NOTMUCH_CONFIG}.snap
     NOTMUCH_CONFIG=${NOTMUCH_CONFIG}.snap notmuch config set database.path $MAIL_DIR.snap