From 992df9a6cb3d3d7a91e21c4c2242227c5e3e29cb Mon Sep 17 00:00:00 2001 From: david Date: Sun, 19 Aug 2012 15:18:30 +0200 Subject: [PATCH] [Patch v3 2/6] test/hex-xcode: new test binary --- 40/d16e205f180296969162e0b39050ec85c7f6e8 | 231 ++++++++++++++++++++++ 1 file changed, 231 insertions(+) create mode 100644 40/d16e205f180296969162e0b39050ec85c7f6e8 diff --git a/40/d16e205f180296969162e0b39050ec85c7f6e8 b/40/d16e205f180296969162e0b39050ec85c7f6e8 new file mode 100644 index 000000000..30a0036b8 --- /dev/null +++ b/40/d16e205f180296969162e0b39050ec85c7f6e8 @@ -0,0 +1,231 @@ +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 53F50431FBD + for ; Mon, 20 Aug 2012 00:18:37 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 f-gXYElhzCnR for ; + Mon, 20 Aug 2012 00:18:34 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2A8A3431FD2 + for ; Mon, 20 Aug 2012 00:18:34 -0700 (PDT) +Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.72) + (envelope-from ) + id 1T3MFt-0002Fr-CZ; Mon, 20 Aug 2012 04:18:33 -0300 +Received: (nullmailer pid 7812 invoked by uid 1000); + Sun, 19 Aug 2012 13:19:07 -0000 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v3 2/6] test/hex-xcode: new test binary +Date: Sun, 19 Aug 2012 15:18:30 +0200 +Message-Id: <1345382314-5330-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1345382314-5330-1-git-send-email-david@tethera.net> +References: <1345382314-5330-1-git-send-email-david@tethera.net> +Cc: David Bremner +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: Mon, 20 Aug 2012 07:18:37 -0000 + +From: David Bremner + +This program is used both as a test-bed/unit-tester for +../util/hex-escape.c, and also as a utility in future tests of dump +and restore. +--- + test/.gitignore | 1 + + test/Makefile.local | 11 +++++- + test/basic | 2 +- + test/hex-xcode.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 115 insertions(+), 2 deletions(-) + create mode 100644 test/hex-xcode.c + +diff --git a/test/.gitignore b/test/.gitignore +index e63c689..be7ab5e 100644 +--- a/test/.gitignore ++++ b/test/.gitignore +@@ -3,4 +3,5 @@ corpus.mail + smtp-dummy + symbol-test + arg-test ++hex-xcode + tmp.* +diff --git a/test/Makefile.local b/test/Makefile.local +index c7f1435..2622185 100644 +--- a/test/Makefile.local ++++ b/test/Makefile.local +@@ -13,6 +13,9 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) + $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a + $(call quiet,CC) -I. $^ -o $@ + ++$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a ++ $(call quiet,CC) -I. $^ -o $@ -ltalloc ++ + $(dir)/smtp-dummy: $(smtp_dummy_modules) + $(call quiet,CC) $^ -o $@ + +@@ -21,7 +24,12 @@ $(dir)/symbol-test: $(dir)/symbol-test.o + + .PHONY: test check + +-test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test ++TEST_BINARIES=$(dir)/arg-test \ ++ $(dir)/hex-xcode \ ++ $(dir)/smtp-dummy \ ++ $(dir)/symbol-test ++ ++test-binaries: $(TEST_BINARIES) + + test: all test-binaries + @${dir}/notmuch-test $(OPTIONS) +@@ -32,4 +40,5 @@ SRCS := $(SRCS) $(smtp_dummy_srcs) + CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \ + $(dir)/symbol-test $(dir)/symbol-test.o \ + $(dir)/arg-test $(dir)/arg-test.o \ ++ $(dir)/hex-xcode $(dir)/hex-xcode.o \ + $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* +diff --git a/test/basic b/test/basic +index d6aed24..af57026 100755 +--- a/test/basic ++++ b/test/basic +@@ -54,7 +54,7 @@ test_begin_subtest 'Ensure that all available tests will be run by notmuch-test' + eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test) + tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) + available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \ +- sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \ ++ sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|hex-xcode)$/d" | \ + sort) + test_expect_equal "$tests_in_suite" "$available" + +diff --git a/test/hex-xcode.c b/test/hex-xcode.c +new file mode 100644 +index 0000000..eec6541 +--- /dev/null ++++ b/test/hex-xcode.c +@@ -0,0 +1,103 @@ ++/* No, nothing to to with IDE from Apple Inc. ++ testbed for ../util/hex-escape.c. ++ ++ usage: ++ hex-xcode [--direction=(encode|decode)] [--omit-newline] < file ++ hex-xcode [--direction=(encode|decode)] [--omit-newline] arg1 arg2 arg3 ... ++ ++ */ ++ ++#include "notmuch-client.h" ++#include "hex-escape.h" ++#include ++ ++ ++enum direction { ++ ENCODE, ++ DECODE ++}; ++ ++static int ++xcode (void *ctx, enum direction dir, char *in, char **buf_p, size_t *size_p) ++{ ++ hex_status_t status; ++ ++ if (dir == ENCODE) ++ status = hex_encode (ctx, in, buf_p, size_p); ++ else ++ status = hex_decode (ctx, in, buf_p, size_p); ++ ++ if (status == HEX_SUCCESS) ++ fputs (*buf_p, stdout); ++ ++ return status; ++} ++ ++ ++int ++main (int argc, char **argv) ++{ ++ ++ ++ enum direction dir = DECODE; ++ int omit_newline = FALSE; ++ ++ notmuch_opt_desc_t options[] = { ++ { NOTMUCH_OPT_KEYWORD, &dir, "direction", 'd', ++ (notmuch_keyword_t []){ { "encode", ENCODE }, ++ { "decode", DECODE }, ++ { 0, 0 } } }, ++ { NOTMUCH_OPT_BOOLEAN, &omit_newline, "omit-newline", 'n', 0 }, ++ { 0, 0, 0, 0, 0 } ++ }; ++ ++ int opt_index = parse_arguments (argc, argv, options, 1); ++ ++ if (opt_index < 0) ++ exit (1); ++ ++ void *ctx = talloc_new (NULL); ++ ++ char *line = NULL; ++ size_t line_size; ++ ssize_t line_len; ++ ++ char *buffer = NULL; ++ size_t buf_size = 0; ++ ++ notmuch_bool_t read_stdin = TRUE; ++ ++ for (; opt_index < argc; opt_index++) { ++ ++ if (xcode (ctx, dir, argv[opt_index], ++ &buffer, &buf_size) != HEX_SUCCESS) ++ return 1; ++ ++ if (!omit_newline) ++ putchar ('\n'); ++ ++ read_stdin = FALSE; ++ } ++ ++ if (!read_stdin) ++ return 0; ++ ++ while ((line_len = getline (&line, &line_size, stdin)) != -1) { ++ ++ chomp_newline (line); ++ ++ if (xcode (ctx, dir, line, &buffer, &buf_size) != HEX_SUCCESS) ++ return 1; ++ ++ if (!omit_newline) ++ putchar ('\n'); ++ ++ } ++ ++ if (line) ++ free (line); ++ ++ talloc_free (ctx); ++ ++ return 0; ++} +-- +1.7.10.4 + -- 2.26.2