Add a tool to support testing the date/time parser module directly and independent of the rest of notmuch. --- test/Makefile.local | 9 +++- test/basic | 2 +- test/parse-time.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 test/parse-time.c diff --git a/test/Makefile.local b/test/Makefile.local index 4a6a4b1..729f38e 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 -lxapian +$(dir)/parse-time: $(dir)/parse-time.o lib/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) @@ -31,4 +35,5 @@ check: test 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)/arg-test $(dir)/arg-test.o \ + $(dir)/parse-time $(dir)/parse-time.o diff --git a/test/basic b/test/basic index d6aed24..c658b95 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|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..b4de76b --- /dev/null +++ b/test/parse-time.c @@ -0,0 +1,145 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + * + * Author: Jani Nikula <jani@nikula.org> + */ + +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "parse-time-string.h" + +/* + * 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 ...] <date/time>\n\n", name); + printf ( + "Parse <date/time> and display it in given format.\n\n" + " -f, --format=FMT output format, FMT according to strftime(3)\n" + " (default: \"%s\")\n" + " -n, --now=N use N seconds since epoch as now (default: now)\n" + " -u, --up round result up (default: no rounding)\n" + " -d, --down round result down (default: no rounding)\n" + " -h, --help print this help\n", + DEFAULT_FORMAT); +} + +int +main (int argc, char *argv[]) +{ + int r; + struct tm tm; + time_t result; + time_t now; + time_t *nowp = NULL; + char *argstr; + int round = PARSE_TIME_NO_ROUND; + char buf[1024]; + const char *format = DEFAULT_FORMAT; + struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "up", no_argument, NULL, 'u' }, + { "down", no_argument, NULL, 'd' }, + { "format", required_argument, NULL, 'f' }, + { "now", required_argument, NULL, 'n' }, + { NULL, 0, NULL, 0 }, + }; + + for (;;) { + int c; + + c = getopt_long (argc, argv, "hudf:n:", options, NULL); + if (c == -1) + break; + + switch (c) { + case 'f': + /* output format */ + format = optarg; + break; + case 'u': + round = PARSE_TIME_ROUND_UP; + break; + case 'd': + round = PARSE_TIME_ROUND_DOWN; + break; + case 'n': + /* specify now in seconds since epoch */ + now = (time_t) strtol (optarg, NULL, 10); + if (now >= (time_t) 0) + nowp = &now; + break; + case 'h': + case '?': + default: + usage (argv[0]); + return 1; + } + } + + argstr = concat_args (optind, argc, argv); + if (!argstr) + return 1; + + r = parse_time_string (argstr, &result, nowp, round); + + free (argstr); + + if (r) + return 1; + + if (!localtime_r (&result, &tm)) + return 1; + + strftime (buf, sizeof (buf), format, &tm); + printf ("%s\n", buf); + + return 0; +} -- 1.7.9.5