Re: [PATCH] test: fix an evident copy-paste error in argument parsing test

diff --git a/a6/e6e5eafa73f6af5230a5c611002e3a5211eac4 b/a6/e6e5eafa73f6af5230a5c611002e3a5211eac4
new file mode 100644 (file)
index 0000000..719916f
--- /dev/null
+++ b/a6/e6e5eafa73f6af5230a5c611002e3a5211eac4
@@ -0,0 +1,113 @@
+Return-Path: <amdragon@mit.edu>\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 8E0FF431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 15:16:05 -0800 (PST)\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 btN8orRjc4+4 for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Dec 2012 15:16:01 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 96342431FBC\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Dec 2012 15:16:01 -0800 (PST)\r
+X-AuditID: 12074424-b7fe06d0000008f0-bc-50bd32b12c5a\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 06.7C.02288.1B23DB05; Mon,  3 Dec 2012 18:16:01 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qB3NG0cu031611; \r
+       Mon, 3 Dec 2012 18:16:00 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB3NFwCB021949\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+       Mon, 3 Dec 2012 18:15:59 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TffF0-0004Q4-2e; Mon, 03 Dec 2012 18:15:58 -0500\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: fix an evident copy-paste error in argument parsing\r
+       test\r
+In-Reply-To: <1354575292-8680-1-git-send-email-jani@nikula.org>\r
+References: <1354575292-8680-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.14+100~gcb9b0b0 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i486-pc-linux-gnu)\r
+Date: Mon, 03 Dec 2012 18:15:58 -0500\r
+Message-ID: <87mwxuybf5.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsUixG6nrrvRaG+AwYOrXBZN050trt+cyezA\r
+       5HHr/mt2j2erbjEHMEVx2aSk5mSWpRbp2yVwZXTvWMRc8I+9ovPjF+YGxhlsXYycHBICJhLP\r
+       Hu5hgrDFJC7cWw8WFxLYxygx9YBeFyMXkL2eUaL71CN2iMQFJomfG1kgEksYJZ5/6mEGSbAJ\r
+       6EusWDuJFcQWEbCSOPfwNVARB4ewQLDE5huSIGFOAXuJSTevMULMsZNYueg3M0iJqEC8xOWl\r
+       CiBhFgFViYbjfWATeYFu6/t2hB3CFpQ4OfMJC4jNLKAlcePfS6YJjAKzkKRmIUktYGRaxSib\r
+       klulm5uYmVOcmqxbnJyYl5dapGuul5tZopeaUrqJERyKLio7GJsPKR1iFOBgVOLhnXBrT4AQ\r
+       a2JZcWXuIUZJDiYlUd5qw70BQnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4X7MD5XhTEiurUovy\r
+       YVLSHCxK4rzXU276CwmkJ5akZqemFqQWwWRlODiUJHi7QIYKFqWmp1akZeaUIKSZODhBhvMA\r
+       Da8DqeEtLkjMLc5Mh8ifYlSUEucN1AdKCIAkMkrz4HphqeIVozjQK8K8niDtPMA0A9f9Cmgw\r
+       E9DgF0K7QQaXJCKkpBoY58arde/pVFsQLnVP6Ozts9ynFXe4zHzjbfno85f3VUqJ84/1tXvf\r
+       +mr5/anoUccf7X4u2454SL9u/OIenulZ+Sy++D/b1cKJItrTDjtrnjpt9Pl40ymJvlWL112U\r
+       lWD/tuCI7feDU0wfvr7wr2BTlfyjxN3xq653CMYFBTy2FlD1XL9/muI3YSWW4oxEQy3mouJE\r
+       AFTfJYPwAgAA\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: Mon, 03 Dec 2012 23:16:05 -0000\r
+\r
+On Mon, 03 Dec 2012, Jani Nikula <jani@nikula.org> wrote:\r
+> ---\r
+>  test/arg-test.c       |    2 +-\r
+>  test/argument-parsing |    2 +-\r
+>  2 files changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/test/arg-test.c b/test/arg-test.c\r
+> index adc56e3..6c49eac 100644\r
+> --- a/test/arg-test.c\r
+> +++ b/test/arg-test.c\r
+> @@ -41,7 +41,7 @@ int main(int argc, char **argv){\r
+>      printf("positional arg 1 %s\n", pos_arg1);\r
+>  \r
+>      if (pos_arg2)\r
+> -    printf("positional arg 2 %s\n", pos_arg1);\r
+> +    printf("positional arg 2 %s\n", pos_arg2);\r
+>  \r
+>  \r
+>      for ( ; opt_index < argc ; opt_index ++) {\r
+> diff --git a/test/argument-parsing b/test/argument-parsing\r
+> index 672de0b..94e9087 100755\r
+> --- a/test/argument-parsing\r
+> +++ b/test/argument-parsing\r
+> @@ -9,7 +9,7 @@ keyword 1\r
+>  int 7\r
+>  string foo\r
+>  positional arg 1 pos1\r
+> -positional arg 2 pos1\r
+> +positional arg 2 pos2\r
+\r
+Someone obviously didn't check their test output.\r
+\r
+>  EOF\r
+>  test_expect_equal_file OUTPUT EXPECTED\r
+>  \r
+\r
+LGTM.\r