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