From: Jani Nikula Date: Sat, 13 Oct 2012 22:09:49 +0000 (+0300) Subject: [PATCH v4 3/9] test: add new test tool parse-time for date/time parser X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=62b0f48845f4accf861f5ac8c5bb18c9e63ea483;p=notmuch-archives.git [PATCH v4 3/9] test: add new test tool parse-time for date/time parser --- diff --git a/b6/55acac5cd4e3965b3d4d99128f0ee4e0824a49 b/b6/55acac5cd4e3965b3d4d99128f0ee4e0824a49 new file mode 100644 index 000000000..7d3674cd2 --- /dev/null +++ b/b6/55acac5cd4e3965b3d4d99128f0ee4e0824a49 @@ -0,0 +1,413 @@ +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 38293431FC0 + for ; Sat, 13 Oct 2012 15:10:14 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +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 VQe-Qb2HyPg2 for ; + Sat, 13 Oct 2012 15:10:10 -0700 (PDT) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 34362431FD9 + for ; Sat, 13 Oct 2012 15:10:10 -0700 (PDT) +Received: by mail-lb0-f181.google.com with SMTP id gg6so2988019lbb.26 + for ; Sat, 13 Oct 2012 15:10:09 -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 + :in-reply-to:references:mime-version:content-type + :content-transfer-encoding:x-gm-message-state; + bh=ZSUL9BbYiKqFjqXbTs/l97CkqFlFBcDhiFkb3Fbo1OE=; + b=Sjfsk2+XQC7RsDpKoT9oxZvvENvxU7civwqKzA9GQFfnE7IxTtUw5LC/kgrA93tojo + GAyofH60tNwU43OfNiFGbDIDRC1YM5TvbdLTU7Fjo3lt0RIk57br+2Lf+zXtuJXVeMdU + BOg7WkmS20yYgHSYIvgi4ydoiEFFYbxiR9USjffqZVB4sNOp3Z9t1JDvp33mzPI3kIoS + V0/Bmkspm0A7S5do1IGEo7zgFxGjnm42CJPSg+Sm1Yl2AroQDQg0LtYbUUwqgzuhmM3+ + yDIDtGw6ISYrBoPT4VGJsGouIUXhfEMjgxsPxxUi3dLeBQKaAeagiAuEWvJlpsJtlR+0 + B/GA== +Received: by 10.152.103.100 with SMTP id fv4mr6628386lab.39.1350166209838; + Sat, 13 Oct 2012 15:10:09 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id gk11sm3221769lab.3.2012.10.13.15.10.08 + (version=SSLv3 cipher=OTHER); Sat, 13 Oct 2012 15:10:09 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: + [PATCH v4 3/9] test: add new test tool parse-time for date/time parser +Date: Sun, 14 Oct 2012 01:09:49 +0300 +Message-Id: + <1d756d343f9d62cfa1c399627002aa1576a0ab27.1350164594.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: +References: +In-Reply-To: +References: +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-Gm-Message-State: + ALoCoQnlW/pcQbVPH7pBiSL4nuEV9lvutLbyqZQIvShEo9Rzd7qY72+HPc2zfsz8w9uht48WkS6F +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: Sat, 13 Oct 2012 22:10:14 -0000 + +Add a smoke testing tool to support testing the date/time parser +module directly and independent of the rest of notmuch. + +Credits to Michal Sojka for the stdin parsing +idea and consequent massive improvement in testability. +--- + test/Makefile.local | 7 +- + test/basic | 2 +- + test/parse-time.c | 281 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 288 insertions(+), 2 deletions(-) + create mode 100644 test/parse-time.c + +diff --git a/test/Makefile.local b/test/Makefile.local +index 45df4c7..9ae130a 100644 +--- a/test/Makefile.local ++++ b/test/Makefile.local +@@ -19,9 +19,13 @@ $(dir)/smtp-dummy: $(smtp_dummy_modules) + $(dir)/symbol-test: $(dir)/symbol-test.o + $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS) + ++$(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o ++ $(call quiet,CC) $^ -o $@ ++ + .PHONY: test check + +-test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test ++test-binaries: $(dir)/arg-test $(dir)/smtp-dummy $(dir)/symbol-test \ ++ $(dir)/parse-time + + test: all test-binaries + @${dir}/notmuch-test $(OPTIONS) +@@ -32,4 +36,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)/parse-time $(dir)/parse-time.o \ + $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* +diff --git a/test/basic b/test/basic +index 3b635c8..c47197c 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 -perm +111 | \ +- sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \ ++ sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \ + sort) + test_expect_equal "$tests_in_suite" "$available" + +diff --git a/test/parse-time.c b/test/parse-time.c +new file mode 100644 +index 0000000..5f73b85 +--- /dev/null ++++ b/test/parse-time.c +@@ -0,0 +1,281 @@ ++/* ++ * parse time string - user friendly date and time parser ++ * Copyright © 2012 Jani Nikula ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ * Author: Jani Nikula ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "parse-time-string.h" ++ ++#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a[0])) ++ ++/* ++ * concat argv[start]...argv[end - 1], separating them by a single ++ * space, to a malloced string ++ */ ++static char * ++concat_args (int start, int end, char *argv[]) ++{ ++ int i; ++ size_t len = 1; ++ char *p; ++ ++ for (i = start; i < end; i++) ++ len += strlen (argv[i]) + 1; ++ ++ p = malloc (len); ++ if (!p) ++ return NULL; ++ ++ *p = 0; ++ ++ for (i = start; i < end; i++) { ++ if (i != start) ++ strcat (p, " "); ++ strcat (p, argv[i]); ++ } ++ ++ return p; ++} ++ ++#define DEFAULT_FORMAT "%a %b %d %T %z %Y" ++ ++static void ++usage (const char *name) ++{ ++ printf ("Usage: %s [options ...] []\n\n", name); ++ printf ( ++ "Parse and display it in given format. If is\n" ++ "not given, parse each line in stdin according to:\n\n" ++ " [(==>|==_>|==^>|==^^>)] [#]\n\n" ++ "and produce output:\n\n" ++ " (==>|==_>|==^>|==^^>)