--- /dev/null
+Return-Path: <jani@nikula.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 11FC6431FD4\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Apr 2012 05:15:50 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 PtgvYZdRCvnO for <notmuch@notmuchmail.org>;\r
+ Sat, 14 Apr 2012 05:15:47 -0700 (PDT)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+ [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id AD00D431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Apr 2012 05:15:44 -0700 (PDT)\r
+Received: by mail-lb0-f181.google.com with SMTP id b5so40243lbd.26\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Apr 2012 05:15:44 -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
+ :in-reply-to:references:x-gm-message-state;\r
+ bh=Sa1X0bPHRHQiErxc62pbcrRL7R+yylPzZFHAcy3qFDg=;\r
+ b=UQW/c/BT2H/4ZwbErZ1DnxE2z4eHKHI+xSfE7yjX7uR7cemkQYqeBFPf8/RI7vgmH3\r
+ M9/wPtBKIRTVKHpC/oYS67MM9XY/YzoRAMZtObRzaFfHDXGDfJbgecCAnDp77Pi3H8fT\r
+ 6gZzJvktB3DDSo7lFaRuqJV09iUY6gaZfYH/Wpua8viDvzBXqFnMrq+9grOWhBFPNMHD\r
+ 9crvmyxMlYvcFTTAeDqzn8wNgyuRYfgmvcLnZ4W+JyEOGPKjVhR60OOUe2PffLIJ8m2R\r
+ reeC8nU7I5TfkYpKHN0JLvWT85lnIa84YVHsk3GjYFI2Ld3kIG0NGCKaB56aUXDxZShz\r
+ YiZw==\r
+Received: by 10.112.37.134 with SMTP id y6mr2162112lbj.102.1334405744334;\r
+ Sat, 14 Apr 2012 05:15:44 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
+ [80.220.80.68])\r
+ by mx.google.com with ESMTPS id fe6sm16009481lbb.9.2012.04.14.05.15.42\r
+ (version=SSLv3 cipher=OTHER); Sat, 14 Apr 2012 05:15:43 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/6] test/hex-xcode: new test binary\r
+Date: Sat, 14 Apr 2012 15:15:27 +0300\r
+Message-Id:\r
+ <e40d095e6a5208d8e720d1f681bd172e28f3f112.1334404979.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1334404979.git.jani@nikula.org>\r
+References: <cover.1334404979.git.jani@nikula.org>\r
+In-Reply-To: <cover.1334404979.git.jani@nikula.org>\r
+References: <cover.1334404979.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmAJ8obfLHNsoFrwJw5pOpNhKThPzRJdHC4Cj28NqT9Xa1pxeEMnN7AAZ9yDS9scNWXWEeN\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: Sat, 14 Apr 2012 12:15:50 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This program is used both as a test-bed/unit-tester for\r
+../util/hex-escape.c, and also as a utility in future tests of dump\r
+and restore.\r
+---\r
+ test/.gitignore | 1 +\r
+ test/Makefile.local | 6 ++-\r
+ test/basic | 2 +-\r
+ test/hex-xcode.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 4 files changed, 110 insertions(+), 2 deletions(-)\r
+ create mode 100644 test/hex-xcode.c\r
+\r
+diff --git a/test/.gitignore b/test/.gitignore\r
+index e63c689..be7ab5e 100644\r
+--- a/test/.gitignore\r
++++ b/test/.gitignore\r
+@@ -3,4 +3,5 @@ corpus.mail\r
+ smtp-dummy\r
+ symbol-test\r
+ arg-test\r
++hex-xcode\r
+ tmp.*\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 4a6a4b1..9cecd28 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -13,6 +13,9 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)\r
+ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a\r
+ $(call quiet,CC) -I. $^ -o $@\r
+ \r
++$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a\r
++ $(call quiet,CC) -I. $^ -o $@ -ltalloc\r
++\r
+ $(dir)/smtp-dummy: $(smtp_dummy_modules)\r
+ $(call quiet,CC) $^ -o $@\r
+ \r
+@@ -21,7 +24,8 @@ $(dir)/symbol-test: $(dir)/symbol-test.o\r
+ \r
+ .PHONY: test check\r
+ \r
+-test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test\r
++test-binaries: $(dir)/arg-test $(dir)/hex-xcode \\r
++ $(dir)/smtp-dummy $(dir)/symbol-test\r
+ \r
+ test: all test-binaries\r
+ @${dir}/notmuch-test $(OPTIONS)\r
+diff --git a/test/basic b/test/basic\r
+index d6aed24..af57026 100755\r
+--- a/test/basic\r
++++ b/test/basic\r
+@@ -54,7 +54,7 @@ test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'\r
+ eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)\r
+ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)\r
+ available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \\r
+- sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \\r
++ sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|hex-xcode)$/d" | \\r
+ sort)\r
+ test_expect_equal "$tests_in_suite" "$available"\r
+ \r
+diff --git a/test/hex-xcode.c b/test/hex-xcode.c\r
+new file mode 100644\r
+index 0000000..eec6541\r
+--- /dev/null\r
++++ b/test/hex-xcode.c\r
+@@ -0,0 +1,103 @@\r
++/* No, nothing to to with IDE from Apple Inc.\r
++ testbed for ../util/hex-escape.c.\r
++\r
++ usage:\r
++ hex-xcode [--direction=(encode|decode)] [--omit-newline] < file\r
++ hex-xcode [--direction=(encode|decode)] [--omit-newline] arg1 arg2 arg3 ...\r
++\r
++ */\r
++\r
++#include "notmuch-client.h"\r
++#include "hex-escape.h"\r
++#include <assert.h>\r
++\r
++\r
++enum direction {\r
++ ENCODE,\r
++ DECODE\r
++};\r
++\r
++static int\r
++xcode (void *ctx, enum direction dir, char *in, char **buf_p, size_t *size_p)\r
++{\r
++ hex_status_t status;\r
++\r
++ if (dir == ENCODE)\r
++ status = hex_encode (ctx, in, buf_p, size_p);\r
++ else\r
++ status = hex_decode (ctx, in, buf_p, size_p);\r
++\r
++ if (status == HEX_SUCCESS)\r
++ fputs (*buf_p, stdout);\r
++\r
++ return status;\r
++}\r
++\r
++\r
++int\r
++main (int argc, char **argv)\r
++{\r
++\r
++\r
++ enum direction dir = DECODE;\r
++ int omit_newline = FALSE;\r
++\r
++ notmuch_opt_desc_t options[] = {\r
++ { NOTMUCH_OPT_KEYWORD, &dir, "direction", 'd',\r
++ (notmuch_keyword_t []){ { "encode", ENCODE },\r
++ { "decode", DECODE },\r
++ { 0, 0 } } },\r
++ { NOTMUCH_OPT_BOOLEAN, &omit_newline, "omit-newline", 'n', 0 },\r
++ { 0, 0, 0, 0, 0 }\r
++ };\r
++\r
++ int opt_index = parse_arguments (argc, argv, options, 1);\r
++\r
++ if (opt_index < 0)\r
++ exit (1);\r
++\r
++ void *ctx = talloc_new (NULL);\r
++\r
++ char *line = NULL;\r
++ size_t line_size;\r
++ ssize_t line_len;\r
++\r
++ char *buffer = NULL;\r
++ size_t buf_size = 0;\r
++\r
++ notmuch_bool_t read_stdin = TRUE;\r
++\r
++ for (; opt_index < argc; opt_index++) {\r
++\r
++ if (xcode (ctx, dir, argv[opt_index],\r
++ &buffer, &buf_size) != HEX_SUCCESS)\r
++ return 1;\r
++\r
++ if (!omit_newline)\r
++ putchar ('\n');\r
++\r
++ read_stdin = FALSE;\r
++ }\r
++\r
++ if (!read_stdin)\r
++ return 0;\r
++\r
++ while ((line_len = getline (&line, &line_size, stdin)) != -1) {\r
++\r
++ chomp_newline (line);\r
++\r
++ if (xcode (ctx, dir, line, &buffer, &buf_size) != HEX_SUCCESS)\r
++ return 1;\r
++\r
++ if (!omit_newline)\r
++ putchar ('\n');\r
++\r
++ }\r
++\r
++ if (line)\r
++ free (line);\r
++\r
++ talloc_free (ctx);\r
++\r
++ return 0;\r
++}\r
+-- \r
+1.7.5.4\r
+\r
projects / notmuch-archives.git / commitdiff