From 387e9dbe240d1ecf639d4f859c38363e4dcedc45 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Sat, 26 May 2012 09:43:28 +2000 Subject: [PATCH] [PATCH 07/10] emacs tests require emacs --- 05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 | 172 ++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 diff --git a/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 b/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 new file mode 100644 index 000000000..694d2ee02 --- /dev/null +++ b/05/bea9df85375cd7ae5d63f69e43a73c0e480cb8 @@ -0,0 +1,172 @@ +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 AD22F431FBC + for ; Fri, 25 May 2012 06:44:07 -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 FO8LD5vPPV+U for ; + Fri, 25 May 2012 06:44:06 -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 AA18B431FC3 + for ; Fri, 25 May 2012 06:44:06 -0700 (PDT) +Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26 + for ; Fri, 25 May 2012 06:44:06 -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=jPMDTB3Qfm8Y2oama9QfEk54K5rrTr2iX4Kr3JKyj14=; + b=UYQBIiKD4zzX1cDJ33S/nIQUCd9UHyF9ZnEe4t85N/2DnO5MPwHUvsKO4RkVPgu7PP + PJNLvPM7ObXx/EWDG3VKNFF5hOxmjto1YZOiUPCxfIQgBik7tsY8tSwPEGm6vA/83zVi + J6j6xx9+4W5bxCY8nJbAhFFq8wViio+mZ+mtuyrllBVb2nyT1rzP8A7bNWe41OcO66vy + liEPkCORn1g7CtA7hZ5Jl7kGbRFGy5Is1l2TWuSdFnJs/h8AACP0DpT21yi7SWt3bvrI + eafUTeyOx3pKDfbEFItfxkioMmajoP1Uc5EKN1WYxpc1d5LeQDBE4RJyMPvxfTPamHsb + S/Aw== +Received: by 10.220.141.207 with SMTP id n15mr3511905vcu.68.1337953446476; + Fri, 25 May 2012 06:44:06 -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 g10sm4254086vdk.2.2012.05.25.06.44.05 + (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 25 May 2012 06:44:05 -0700 (PDT) +Received: by nas.home.pioto.org (Postfix, from userid 1001) + id 13CC0287C9; Fri, 25 May 2012 09:44:05 -0400 (EDT) +From: Mike Kelly +To: notmuch@notmuchmail.org +Subject: [PATCH 07/10] emacs tests require emacs +Date: Fri, 25 May 2012 09:43:28 -0400 +Message-Id: <1337953411-21000-8-git-send-email-pioto@pioto.org> +X-Mailer: git-send-email 1.7.10.2 +In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org> +References: <1337953411-21000-1-git-send-email-pioto@pioto.org> +X-Gm-Message-State: + ALoCoQkyZbEgUSR8gjGiExjYTzsHV/PQIXJO1punyh0Gkpa8qkp9B+3oMxRlN9m9WdD2d31dm85y +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: Fri, 25 May 2012 13:44:07 -0000 + +Immediately skip all emacs tests when we don't have emacs. +--- + test/emacs | 2 ++ + test/emacs-address-cleaning | 2 ++ + test/emacs-hello | 2 ++ + test/emacs-large-search-buffer | 2 ++ + test/emacs-show | 2 ++ + test/emacs-subject-to-filename | 2 ++ + test/emacs-test-functions | 2 ++ + 7 files changed, 14 insertions(+) + +diff --git a/test/emacs b/test/emacs +index e9f954c..cc42b21 100755 +--- a/test/emacs ++++ b/test/emacs +@@ -3,6 +3,8 @@ + test_description="emacs interface" + . test-lib.sh + ++test_require_external_prereq emacs ++ + EXPECTED=$TEST_DIRECTORY/emacs.expected-output + + add_email_corpus +diff --git a/test/emacs-address-cleaning b/test/emacs-address-cleaning +index 6ddde5c..9a189d5 100755 +--- a/test/emacs-address-cleaning ++++ b/test/emacs-address-cleaning +@@ -3,6 +3,8 @@ + test_description="emacs address cleaning" + . test-lib.sh + ++test_require_external_prereq emacs ++ + test_begin_subtest "notmuch-test-address-clean part 1" + test_emacs_expect_t '(notmuch-test-address-cleaning-1)' + +diff --git a/test/emacs-hello b/test/emacs-hello +index a998dc4..b4ca831 100755 +--- a/test/emacs-hello ++++ b/test/emacs-hello +@@ -3,6 +3,8 @@ + test_description="Testing emacs notmuch-hello view" + . test-lib.sh + ++test_require_external_prereq emacs ++ + EXPECTED=$TEST_DIRECTORY/emacs.expected-output + + add_email_corpus +diff --git a/test/emacs-large-search-buffer b/test/emacs-large-search-buffer +index 4351e33..f5c8927 100755 +--- a/test/emacs-large-search-buffer ++++ b/test/emacs-large-search-buffer +@@ -2,6 +2,8 @@ + test_description="Emacs with large search results buffer" + . test-lib.sh + ++test_require_external_prereq emacs ++ + x=xxxxxxxxxx # 10 + x=$x$x$x$x$x$x$x$x$x$x # 100 + x=$x$x$x$x$x$x$x$x$x # 900 +diff --git a/test/emacs-show b/test/emacs-show +index 5700d2e..b2a5cb2 100755 +--- a/test/emacs-show ++++ b/test/emacs-show +@@ -3,6 +3,8 @@ + test_description="Testing emacs notmuch-show view" + . test-lib.sh + ++test_require_external_prereq emacs ++ + test_begin_subtest "Hiding Original Message region at beginning of a message" + message_id='OriginalMessageHiding.1@notmuchmail.org' + add_message \ +diff --git a/test/emacs-subject-to-filename b/test/emacs-subject-to-filename +index 176e685..e8bc3ca 100755 +--- a/test/emacs-subject-to-filename ++++ b/test/emacs-subject-to-filename +@@ -3,6 +3,8 @@ + test_description="emacs: mail subject to filename" + . test-lib.sh + ++test_require_external_prereq emacs ++ + # emacs server can't be started in a child process with $(test_emacs ...) + test_emacs '(ignore)' + +diff --git a/test/emacs-test-functions b/test/emacs-test-functions +index 0e1f9fc..dbbe7e4 100755 +--- a/test/emacs-test-functions ++++ b/test/emacs-test-functions +@@ -3,6 +3,8 @@ + test_description="emacs test function sanity" + . test-lib.sh + ++test_require_external_prereq emacs ++ + test_begin_subtest "emacs test function sanity" + test_emacs_expect_t 't' + +-- +1.7.10.2 + -- 2.26.2