diff --git a/.gitignore b/.gitignore
index 9e2b3333cb51c85b79b205d696aa3db64ad06727..45e5a8d42d7f32d85200498cf48787e22d4f919f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,7 @@
# zscanner
/src/zscanner/tests/tmp/
-/src/zscanner/tests/runtests
+/src/zscanner/tests/unittests
/src/zscanner/tests/zscanner-tool
# Binaries
diff --git a/libtap/Makefile.am b/libtap/Makefile.am
index 61c403a8c26dbfd5cc146da13fec15ea0e752041..3246e147441a792f0aa8ce3d49b63997f0ee5c3e 100644
--- a/libtap/Makefile.am
+++ b/libtap/Makefile.am
@@ -7,3 +7,6 @@ check_LIBRARIES = libtap.a
check_PROGRAMS = \
runtests
+
+EXTRA_DIST = \
+ tap/libtap.sh
diff --git a/src/zscanner/tests/Makefile.inc b/src/zscanner/tests/Makefile.inc
index a0babc09b4e50e4496d6b537008bcc0fa7ea3b4a..7413d1ca3fe9c3407aa56e1809a88f415c13e906 100644
--- a/src/zscanner/tests/Makefile.inc
+++ b/src/zscanner/tests/Makefile.inc
@@ -1,36 +1,41 @@
-# -*- mode: makefile; -*-
-# vim: syntax=automake
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src
+
+LDADD = \
+ $(top_builddir)/src/zscanner/libzscanner.la
+
+tests_zscanner_tool_SOURCES = \
+ tests/zscanner-tool.c \
+ tests/tests.h \
+ tests/tests.c \
+ tests/processing.h \
+ tests/processing.c
check_PROGRAMS = \
- tests/runtests \
tests/zscanner-tool
-dist_check_SCRIPTS = \
- tests/zscanner.sh
+check_SCRIPTS = \
+ tests/unittests
-AM_CPPFLAGS = \
- -I$(top_srcdir)/src
+CLEANFILES += $(check_SCRIPTS)
+
+edit = sed \
+ -e 's|@top_srcdir[@]|$(abs_top_srcdir)|g' \
+ -e 's|@top_builddir[@]|$(abs_top_builddir)|g'
-tests_runtests_CPPFLAGS = \
- -DSOURCE='"$(abs_srcdir)/tests"' \
- -DBUILD='"$(abs_builddir)/tests"'
+tests/unittests:
+ $(edit) < $(top_srcdir)/src/zscanner/$@.in > $(top_builddir)/src/zscanner/$@
+ chmod +x $(top_builddir)/src/zscanner/$@
check-compile-only: $(check_PROGRAMS)
check-local: $(check_PROGRAMS)
- cd tests && ./runtests -l $(abs_srcdir)/tests/TESTS
-
-tests_zscanner_tool_SOURCES = \
- tests/zscanner-tool.c \
- tests/tests.h \
- tests/tests.c \
- tests/processing.h \
- tests/processing.c
-
-tests_zscanner_tool_LDADD = libzscanner.la
-
-EXTRA_DIST += \
- tests/TESTS \
- tests/zscanner-TESTS \
- tests/data \
- tests/tap/libtap.sh
+ $(top_builddir)/libtap/runtests \
+ -s $(top_srcdir)/src/zscanner/tests \
+ -b $(top_builddir)/src/zscanner/tests \
+ $(top_builddir)/src/zscanner/tests/unittests
+
+EXTRA_DIST += \
+ tests/unittests.in \
+ tests/TESTS \
+ tests/data
diff --git a/src/zscanner/tests/TESTS b/src/zscanner/tests/TESTS
index c3e0104ddeda2eee2766be03575dd67f5f316c16..c88aef1e3a199e8385f313810c6ef9f3d6001cb0 100644
--- a/src/zscanner/tests/TESTS
+++ b/src/zscanner/tests/TESTS
@@ -1 +1,68 @@
-zscanner.sh
+00-0_general
+00-1_general
+01_owner
+02_class
+03_rrttl
+04-0_ORIGIN
+04-1_ORIGIN
+04-2_ORIGIN
+04-3_ORIGIN
+04-4_ORIGIN
+04-5_ORIGIN
+04-6_ORIGIN
+04-7_ORIGIN
+04-8_ORIGIN
+04-9_ORIGIN
+05-0_TTL
+05-1_TTL
+05-2_TTL
+05-3_TTL
+05-4_TTL
+06-0_INCLUDE
+06-1_INCLUDE
+06-2_INCLUDE
+06-3_INCLUDE
+06-4_INCLUDE
+06-5_INCLUDE
+06-6_INCLUDE
+06-7_INCLUDE
+06-8_INCLUDE
+10_A
+11_AAAA
+12_TXT
+13_SPF
+14_NS
+15_CNAME
+16_PTR
+17_DNAME
+18_MX
+19_AFSDB
+20_RT
+21_KX
+22_HINFO
+23_MINFO
+24_RP
+25_SOA
+26_SRV
+27_NAPTR
+28_TYPE
+29_CERT
+30_KEY
+31_DNSKEY
+32_APL
+33_DS
+34_SSHFP
+35_IPSECKEY
+36_RRSIG
+37_NSEC
+38_DHCID
+39_NSEC3
+40_NSEC3PARAM
+41_TLSA
+42_LOC
+43_EUI48
+44_EUI64
+45_NID
+46_L32
+47_L64
+48_LP
diff --git a/src/zscanner/tests/runtests.c b/src/zscanner/tests/runtests.c
deleted file mode 100644
index a5cb77a291ed1d14883fa3c45b7468068765d3f4..0000000000000000000000000000000000000000
--- a/src/zscanner/tests/runtests.c
+++ /dev/null
@@ -1,1385 +0,0 @@
-/*
- * Run a set of tests, reporting results.
- *
- * Usage:
- *
- * runtests [-b <build-dir>] [-s <source-dir>] <test-list>
- * runtests -o [-b <build-dir>] [-s <source-dir>] <test>
- *
- * In the first case, expects a list of executables located in the given file,
- * one line per executable. For each one, runs it as part of a test suite,
- * reporting results. Test output should start with a line containing the
- * number of tests (numbered from 1 to this number), optionally preceded by
- * "1..", although that line may be given anywhere in the output. Each
- * additional line should be in the following format:
- *
- * ok <number>
- * not ok <number>
- * ok <number> # skip
- * not ok <number> # todo
- *
- * where <number> is the number of the test. An optional comment is permitted
- * after the number if preceded by whitespace. ok indicates success, not ok
- * indicates failure. "# skip" and "# todo" are a special cases of a comment,
- * and must start with exactly that formatting. They indicate the test was
- * skipped for some reason (maybe because it doesn't apply to this platform)
- * or is testing something known to currently fail. The text following either
- * "# skip" or "# todo" and whitespace is the reason.
- *
- * As a special case, the first line of the output may be in the form:
- *
- * 1..0 # skip some reason
- *
- * which indicates that this entire test case should be skipped and gives a
- * reason.
- *
- * Any other lines are ignored, although for compliance with the TAP protocol
- * all lines other than the ones in the above format should be sent to
- * standard error rather than standard output and start with #.
- *
- * This is a subset of TAP as documented in Test::Harness::TAP or
- * TAP::Parser::Grammar, which comes with Perl.
- *
- * If the -o option is given, instead run a single test and display all of its
- * output. This is intended for use with failing tests so that the person
- * running the test suite can get more details about what failed.
- *
- * If built with the C preprocessor symbols SOURCE and BUILD defined, C TAP
- * Harness will export those values in the environment so that tests can find
- * the source and build directory and will look for tests under both
- * directories. These paths can also be set with the -b and -s command-line
- * options, which will override anything set at build time.
- *
- * Any bug reports, bug fixes, and improvements are very much welcome and
- * should be sent to the e-mail address below. This program is part of C TAP
- * Harness <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
- *
- * Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011
- * Russ Allbery <rra@stanford.edu>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
-*/
-
-/* Required for fdopen(), getopt(), and putenv(). */
-#if defined(__STRICT_ANSI__) || defined(PEDANTIC)
-# ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 500
-# endif
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
-
-/* sys/time.h must be included before sys/resource.h on some platforms. */
-#include <sys/resource.h>
-
-/* AIX doesn't have WCOREDUMP. */
-#ifndef WCOREDUMP
-# define WCOREDUMP(status) ((unsigned)(status) & 0x80)
-#endif
-
-/*
- * Used for iterating through arrays. Returns the number of elements in the
- * array (useful for a < upper bound in a for loop).
- */
-#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
-/*
- * The source and build versions of the tests directory. This is used to set
- * the SOURCE and BUILD environment variables and find test programs, if set.
- * Normally, this should be set as part of the build process to the test
- * subdirectories of $(abs_top_srcdir) and $(abs_top_builddir) respectively.
- */
-#ifndef SOURCE
-# define SOURCE NULL
-#endif
-#ifndef BUILD
-# define BUILD NULL
-#endif
-
-/* Test status codes. */
-enum test_status {
- TEST_FAIL,
- TEST_PASS,
- TEST_SKIP,
- TEST_INVALID
-};
-
-/* Indicates the state of our plan. */
-enum plan_status {
- PLAN_INIT, /* Nothing seen yet. */
- PLAN_FIRST, /* Plan seen before any tests. */
- PLAN_PENDING, /* Test seen and no plan yet. */
- PLAN_FINAL /* Plan seen after some tests. */
-};
-
-/* Error exit statuses for test processes. */
-#define CHILDERR_DUP 100 /* Couldn't redirect stderr or stdout. */
-#define CHILDERR_EXEC 101 /* Couldn't exec child process. */
-#define CHILDERR_STDERR 102 /* Couldn't open stderr file. */
-
-/* Structure to hold data for a set of tests. */
-struct testset {
- char *file; /* The file name of the test. */
- char *path; /* The path to the test program. */
- enum plan_status plan; /* The status of our plan. */
- unsigned long count; /* Expected count of tests. */
- unsigned long current; /* The last seen test number. */
- unsigned int length; /* The length of the last status message. */
- unsigned long passed; /* Count of passing tests. */
- unsigned long failed; /* Count of failing lists. */
- unsigned long skipped; /* Count of skipped tests (passed). */
- unsigned long allocated; /* The size of the results table. */
- enum test_status *results; /* Table of results by test number. */
- unsigned int aborted; /* Whether the set was aborted. */
- int reported; /* Whether the results were reported. */
- int status; /* The exit status of the test. */
- unsigned int all_skipped; /* Whether all tests were skipped. */
- char *reason; /* Why all tests were skipped. */
-};
-
-/* Structure to hold a linked list of test sets. */
-struct testlist {
- struct testset *ts;
- struct testlist *next;
-};
-
-/*
- * Usage message. Should be used as a printf format with four arguments: the
- * path to runtests, given three times, and the usage_description. This is
- * split into variables to satisfy the pedantic ISO C90 limit on strings.
- */
-static const char usage_message[] = "\
-Usage: %s [-b <build-dir>] [-s <source-dir>] <test> ...\n\
- %s [-b <build-dir>] [-s <source-dir>] -l <test-list>\n\
- %s -o [-b <build-dir>] [-s <source-dir>] <test>\n\
-\n%s";
-static const char usage_extra[] = "\
-Options:\n\
- -b <build-dir> Set the build directory to <build-dir>\n\
- -l <list> Take the list of tests to run from <test-list>\n\
- -o Run a single test rather than a list of tests\n\
- -s <source-dir> Set the source directory to <source-dir>\n\
-\n\
-runtests normally runs each test listed on the command line. With the -l\n\
-option, it instead runs every test listed in a file. With the -o option,\n\
-it instead runs a single test and shows its complete output.\n";
-
-/*
- * Header used for test output. %s is replaced by the file name of the list
- * of tests.
- */
-static const char banner[] = "\n\
-Running all tests listed in %s. If any tests fail, run the failing\n\
-test program with runtests -o to see more details.\n\n";
-
-/* Header for reports of failed tests. */
-static const char header[] = "\n\
-Failed Set Fail/Total (%) Skip Stat Failing Tests\n\
--------------------------- -------------- ---- ---- ------------------------";
-
-/* Include the file name and line number in malloc failures. */
-#define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
-#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
-#define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
-#define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
-
-/*
- * __attribute__ is available in gcc 2.5 and later, but only with gcc 2.7
- * could you use the __format__ form of the attributes, which is what we use
- * (to avoid confusion with other macros).
- */
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-# define __attribute__(spec) /* empty */
-# endif
-#endif
-
-/*
- * We use __alloc_size__, but it was only available in fairly recent versions
- * of GCC. Suppress warnings about the unknown attribute if GCC is too old.
- * We know that we're GCC at this point, so we can use the GCC variadic macro
- * extension, which will still work with versions of GCC too old to have C99
- * variadic macro support.
- */
-#if !defined(__attribute__) && !defined(__alloc_size__)
-# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-# define __alloc_size__(spec, args...) /* empty */
-# endif
-#endif
-
-/*
- * LLVM and Clang pretend to be GCC but don't support all of the __attribute__
- * settings that GCC does. For them, suppress warnings about unknown
- * attributes on declarations. This unfortunately will affect the entire
- * compilation context, but there's no push and pop available.
- */
-#if !defined(__attribute__) && (defined(__llvm__) || defined(__clang__))
-# pragma GCC diagnostic ignored "-Wattributes"
-#endif
-
-/* Declare internal functions that benefit from compiler attributes. */
-static void sysdie(const char *, ...)
- __attribute__((__nonnull__, __noreturn__, __format__(printf, 1, 2)));
-static void *x_calloc(size_t, size_t, const char *, int)
- __attribute__((__alloc_size__(1, 2), __malloc__, __nonnull__));
-static void *x_malloc(size_t, const char *, int)
- __attribute__((__alloc_size__(1), __malloc__, __nonnull__));
-static void *x_realloc(void *, size_t, const char *, int)
- __attribute__((__alloc_size__(2), __malloc__, __nonnull__(3)));
-static char *x_strdup(const char *, const char *, int)
- __attribute__((__malloc__, __nonnull__));
-
-
-/*
- * Report a fatal error, including the results of strerror, and exit.
- */
-static void
-sysdie(const char *format, ...)
-{
- int oerrno;
- va_list args;
-
- oerrno = errno;
- fflush(stdout);
- fprintf(stderr, "runtests: ");
- va_start(args, format);
- vfprintf(stderr, format, args);
- va_end(args);
- fprintf(stderr, ": %s\n", strerror(oerrno));
- exit(1);
-}
-
-
-/*
- * Allocate zeroed memory, reporting a fatal error and exiting on failure.
- */
-static void *
-x_calloc(size_t n, size_t size, const char *file, int line)
-{
- void *p;
-
- n = (n > 0) ? n : 1;
- size = (size > 0) ? size : 1;
- p = calloc(n, size);
- if (p == NULL)
- sysdie("failed to calloc %lu bytes at %s line %d",
- (unsigned long) size, file, line);
- return p;
-}
-
-
-/*
- * Allocate memory, reporting a fatal error and exiting on failure.
- */
-static void *
-x_malloc(size_t size, const char *file, int line)
-{
- void *p;
-
- p = malloc(size);
- if (p == NULL)
- sysdie("failed to malloc %lu bytes at %s line %d",
- (unsigned long) size, file, line);
- return p;
-}
-
-
-/*
- * Reallocate memory, reporting a fatal error and exiting on failure.
- */
-static void *
-x_realloc(void *p, size_t size, const char *file, int line)
-{
- p = realloc(p, size);
- if (p == NULL)
- sysdie("failed to realloc %lu bytes at %s line %d",
- (unsigned long) size, file, line);
- return p;
-}
-
-
-/*
- * Copy a string, reporting a fatal error and exiting on failure.
- */
-static char *
-x_strdup(const char *s, const char *file, int line)
-{
- char *p;
- size_t len;
-
- len = strlen(s) + 1;
- p = malloc(len);
- if (p == NULL)
- sysdie("failed to strdup %lu bytes at %s line %d",
- (unsigned long) len, file, line);
- memcpy(p, s, len);
- return p;
-}
-
-
-/*
- * Given a struct timeval, return the number of seconds it represents as a
- * double. Use difftime() to convert a time_t to a double.
- */
-static double
-tv_seconds(const struct timeval *tv)
-{
- return difftime(tv->tv_sec, 0) + tv->tv_usec * 1e-6;
-}
-
-
-/*
- * Given two struct timevals, return the difference in seconds.
- */
-static double
-tv_diff(const struct timeval *tv1, const struct timeval *tv0)
-{
- return tv_seconds(tv1) - tv_seconds(tv0);
-}
-
-
-/*
- * Given two struct timevals, return the sum in seconds as a double.
- */
-static double
-tv_sum(const struct timeval *tv1, const struct timeval *tv2)
-{
- return tv_seconds(tv1) + tv_seconds(tv2);
-}
-
-
-/*
- * Given a pointer to a string, skip any leading whitespace and return a
- * pointer to the first non-whitespace character.
- */
-static const char *
-skip_whitespace(const char *p)
-{
- while (isspace((unsigned char)(*p)))
- p++;
- return p;
-}
-
-
-/*
- * Start a program, connecting its stdout to a pipe on our end and its stderr
- * to /dev/null, and storing the file descriptor to read from in the two
- * argument. Returns the PID of the new process. Errors are fatal.
- */
-static pid_t
-test_start(const char *path, int *fd)
-{
- int fds[2], errfd;
- pid_t child;
-
- if (pipe(fds) == -1) {
- puts("ABORTED");
- fflush(stdout);
- sysdie("can't create pipe");
- }
- child = fork();
- if (child == (pid_t) -1) {
- puts("ABORTED");
- fflush(stdout);
- sysdie("can't fork");
- } else if (child == 0) {
- /* In child. Set up our stdout and stderr. */
- errfd = open("/dev/null", O_WRONLY);
- if (errfd < 0)
- _exit(CHILDERR_STDERR);
- if (dup2(errfd, 2) == -1)
- _exit(CHILDERR_DUP);
- close(fds[0]);
- if (dup2(fds[1], 1) == -1)
- _exit(CHILDERR_DUP);
-
- /* Now, exec our process. */
- if (execl(path, path, (char *) 0) == -1)
- _exit(CHILDERR_EXEC);
- } else {
- /* In parent. Close the extra file descriptor. */
- close(fds[1]);
- }
- *fd = fds[0];
- return child;
-}
-
-
-/*
- * Back up over the output saying what test we were executing.
- */
-static void
-test_backspace(struct testset *ts)
-{
- unsigned int i;
-
- if (!isatty(STDOUT_FILENO))
- return;
- for (i = 0; i < ts->length; i++)
- putchar('\b');
- for (i = 0; i < ts->length; i++)
- putchar(' ');
- for (i = 0; i < ts->length; i++)
- putchar('\b');
- ts->length = 0;
-}
-
-
-/*
- * Read the plan line of test output, which should contain the range of test
- * numbers. We may initialize the testset structure here if we haven't yet
- * seen a test. Return true if initialization succeeded and the test should
- * continue, false otherwise.
- */
-static int
-test_plan(const char *line, struct testset *ts)
-{
- unsigned long i;
- long n;
-
- /*
- * Accept a plan without the leading 1.. for compatibility with older
- * versions of runtests. This will only be allowed if we've not yet seen
- * a test result.
- */
- line = skip_whitespace(line);
- if (strncmp(line, "1..", 3) == 0)
- line += 3;
-
- /*
- * Get the count, check it for validity, and initialize the struct. If we
- * have something of the form "1..0 # skip foo", the whole file was
- * skipped; record that. If we do skip the whole file, zero out all of
- * our statistics, since they're no longer relevant. strtol is called
- * with a second argument to advance the line pointer past the count to
- * make it simpler to detect the # skip case.
- */
- n = strtol(line, (char **) &line, 10);
- if (n == 0) {
- line = skip_whitespace(line);
- if (*line == '#') {
- line = skip_whitespace(line + 1);
- if (strncasecmp(line, "skip", 4) == 0) {
- line = skip_whitespace(line + 4);
- if (*line != '\0') {
- ts->reason = xstrdup(line);
- ts->reason[strlen(ts->reason) - 1] = '\0';
- }
- ts->all_skipped = 1;
- ts->aborted = 1;
- ts->count = 0;
- ts->passed = 0;
- ts->skipped = 0;
- ts->failed = 0;
- return 0;
- }
- }
- }
- if (n <= 0) {
- puts("ABORTED (invalid test count)");
- ts->aborted = 1;
- ts->reported = 1;
- return 0;
- }
- if (ts->plan == PLAN_INIT && ts->allocated == 0) {
- ts->count = n;
- ts->allocated = n;
- ts->plan = PLAN_FIRST;
- ts->results = xmalloc(ts->count * sizeof(enum test_status));
- for (i = 0; i < ts->count; i++)
- ts->results[i] = TEST_INVALID;
- } else if (ts->plan == PLAN_PENDING) {
- if ((unsigned long) n < ts->count) {
- test_backspace(ts);
- printf("ABORTED (invalid test number %lu)\n", ts->count);
- ts->aborted = 1;
- ts->reported = 1;
- return 0;
- }
- ts->count = n;
- if ((unsigned long) n > ts->allocated) {
- ts->results = xrealloc(ts->results, n * sizeof(enum test_status));
- for (i = ts->allocated; i < ts->count; i++)
- ts->results[i] = TEST_INVALID;
- ts->allocated = n;
- }
- ts->plan = PLAN_FINAL;
- }
- return 1;
-}
-
-
-/*
- * Given a single line of output from a test, parse it and return the success
- * status of that test. Anything printed to stdout not matching the form
- * /^(not )?ok \d+/ is ignored. Sets ts->current to the test number that just
- * reported status.
- */
-static void
-test_checkline(const char *line, struct testset *ts)
-{
- enum test_status status = TEST_PASS;
- const char *bail;
- char *end;
- long number;
- unsigned long i, current;
- int outlen;
-
- /* Before anything, check for a test abort. */
- bail = strstr(line, "Bail out!");
- if (bail != NULL) {
- bail = skip_whitespace(bail + strlen("Bail out!"));
- if (*bail != '\0') {
- size_t length;
-
- length = strlen(bail);
- if (bail[length - 1] == '\n')
- length--;
- test_backspace(ts);
- printf("ABORTED (%.*s)\n", (int) length, bail);
- ts->reported = 1;
- }
- ts->aborted = 1;
- return;
- }
-
- /*
- * If the given line isn't newline-terminated, it was too big for an
- * fgets(), which means ignore it.
- */
- if (line[strlen(line) - 1] != '\n')
- return;
-
- /* If the line begins with a hash mark, ignore it. */
- if (line[0] == '#')
- return;
-
- /* If we haven't yet seen a plan, look for one. */
- if (ts->plan == PLAN_INIT && isdigit((unsigned char)(*line))) {
- if (!test_plan(line, ts))
- return;
- } else if (strncmp(line, "1..", 3) == 0) {
- if (ts->plan == PLAN_PENDING) {
- if (!test_plan(line, ts))
- return;
- } else {
- test_backspace(ts);
- puts("ABORTED (multiple plans)");
- ts->aborted = 1;
- ts->reported = 1;
- return;
- }
- }
-
- /* Parse the line, ignoring something we can't parse. */
- if (strncmp(line, "not ", 4) == 0) {
- status = TEST_FAIL;
- line += 4;
- }
- if (strncmp(line, "ok", 2) != 0)
- return;
- line = skip_whitespace(line + 2);
- errno = 0;
- number = strtol(line, &end, 10);
- if (errno != 0 || end == line)
- number = ts->current + 1;
- current = number;
- if (number <= 0 || (current > ts->count && ts->plan == PLAN_FIRST)) {
- test_backspace(ts);
- printf("ABORTED (invalid test number %lu)\n", current);
- ts->aborted = 1;
- ts->reported = 1;
- return;
- }
-
- /* We have a valid test result. Tweak the results array if needed. */
- if (ts->plan == PLAN_INIT || ts->plan == PLAN_PENDING) {
- ts->plan = PLAN_PENDING;
- if (current > ts->count)
- ts->count = current;
- if (current > ts->allocated) {
- unsigned long n;
-
- n = (ts->allocated == 0) ? 32 : ts->allocated * 2;
- if (n < current)
- n = current;
- ts->results = xrealloc(ts->results, n * sizeof(enum test_status));
- for (i = ts->allocated; i < n; i++)
- ts->results[i] = TEST_INVALID;
- ts->allocated = n;
- }
- }
-
- /*
- * Handle directives. We should probably do something more interesting
- * with unexpected passes of todo tests.
- */
- while (isdigit((unsigned char)(*line)))
- line++;
- line = skip_whitespace(line);
- if (*line == '#') {
- line = skip_whitespace(line + 1);
- if (strncasecmp(line, "skip", 4) == 0)
- status = TEST_SKIP;
- if (strncasecmp(line, "todo", 4) == 0)
- status = (status == TEST_FAIL) ? TEST_SKIP : TEST_FAIL;
- }
-
- /* Make sure that the test number is in range and not a duplicate. */
- if (ts->results[current - 1] != TEST_INVALID) {
- test_backspace(ts);
- printf("ABORTED (duplicate test number %lu)\n", current);
- ts->aborted = 1;
- ts->reported = 1;
- return;
- }
-
- /* Good results. Increment our various counters. */
- switch (status) {
- case TEST_PASS: ts->passed++; break;
- case TEST_FAIL: ts->failed++; break;
- case TEST_SKIP: ts->skipped++; break;
- case TEST_INVALID: break;
- }
- ts->current = current;
- ts->results[current - 1] = status;
- if (isatty(STDOUT_FILENO)) {
- test_backspace(ts);
- if (ts->plan == PLAN_PENDING)
- outlen = printf("%lu/?", current);
- else
- outlen = printf("%lu/%lu", current, ts->count);
- ts->length = (outlen >= 0) ? outlen : 0;
- fflush(stdout);
- }
-}
-
-
-/*
- * Print out a range of test numbers, returning the number of characters it
- * took up. Takes the first number, the last number, the number of characters
- * already printed on the line, and the limit of number of characters the line
- * can hold. Add a comma and a space before the range if chars indicates that
- * something has already been printed on the line, and print ... instead if
- * chars plus the space needed would go over the limit (use a limit of 0 to
- * disable this).
- */
-static unsigned int
-test_print_range(unsigned long first, unsigned long last, unsigned int chars,
- unsigned int limit)
-{
- unsigned int needed = 0;
- unsigned long n;
-
- for (n = first; n > 0; n /= 10)
- needed++;
- if (last > first) {
- for (n = last; n > 0; n /= 10)
- needed++;
- needed++;
- }
- if (chars > 0)
- needed += 2;
- if (limit > 0 && chars + needed > limit) {
- needed = 0;
- if (chars <= limit) {
- if (chars > 0) {
- printf(", ");
- needed += 2;
- }
- printf("...");
- needed += 3;
- }
- } else {
- if (chars > 0)
- printf(", ");
- if (last > first)
- printf("%lu-", first);
- printf("%lu", last);
- }
- return needed;
-}
-
-
-/*
- * Summarize a single test set. The second argument is 0 if the set exited
- * cleanly, a positive integer representing the exit status if it exited
- * with a non-zero status, and a negative integer representing the signal
- * that terminated it if it was killed by a signal.
- */
-static void
-test_summarize(struct testset *ts, int status)
-{
- unsigned long i;
- unsigned long missing = 0;
- unsigned long failed = 0;
- unsigned long first = 0;
- unsigned long last = 0;
-
- if (ts->aborted) {
- fputs("ABORTED", stdout);
- if (ts->count > 0)
- printf(" (passed %lu/%lu)", ts->passed, ts->count - ts->skipped);
- } else {
- for (i = 0; i < ts->count; i++) {
- if (ts->results[i] == TEST_INVALID) {
- if (missing == 0)
- fputs("MISSED ", stdout);
- if (first && i == last)
- last = i + 1;
- else {
- if (first)
- test_print_range(first, last, missing - 1, 0);
- missing++;
- first = i + 1;
- last = i + 1;
- }
- }
- }
- if (first)
- test_print_range(first, last, missing - 1, 0);
- first = 0;
- last = 0;
- for (i = 0; i < ts->count; i++) {
- if (ts->results[i] == TEST_FAIL) {
- if (missing && !failed)
- fputs("; ", stdout);
- if (failed == 0)
- fputs("FAILED ", stdout);
- if (first && i == last)
- last = i + 1;
- else {
- if (first)
- test_print_range(first, last, failed - 1, 0);
- failed++;
- first = i + 1;
- last = i + 1;
- }
- }
- }
- if (first)
- test_print_range(first, last, failed - 1, 0);
- if (!missing && !failed) {
- fputs(!status ? "ok" : "dubious", stdout);
- if (ts->skipped > 0) {
- if (ts->skipped == 1)
- printf(" (skipped %lu test)", ts->skipped);
- else
- printf(" (skipped %lu tests)", ts->skipped);
- }
- }
- }
- if (status > 0)
- printf(" (exit status %d)", status);
- else if (status < 0)
- printf(" (killed by signal %d%s)", -status,
- WCOREDUMP(ts->status) ? ", core dumped" : "");
- putchar('\n');
-}
-
-
-/*
- * Given a test set, analyze the results, classify the exit status, handle a
- * few special error messages, and then pass it along to test_summarize() for
- * the regular output. Returns true if the test set ran successfully and all
- * tests passed or were skipped, false otherwise.
- */
-static int
-test_analyze(struct testset *ts)
-{
- if (ts->reported)
- return 0;
- if (ts->all_skipped) {
- if (ts->reason == NULL)
- puts("skipped");
- else
- printf("skipped (%s)\n", ts->reason);
- return 1;
- } else if (WIFEXITED(ts->status) && WEXITSTATUS(ts->status) != 0) {
- switch (WEXITSTATUS(ts->status)) {
- case CHILDERR_DUP:
- if (!ts->reported)
- puts("ABORTED (can't dup file descriptors)");
- break;
- case CHILDERR_EXEC:
- if (!ts->reported)
- puts("ABORTED (execution failed -- not found?)");
- break;
- case CHILDERR_STDERR:
- if (!ts->reported)
- puts("ABORTED (can't open /dev/null)");
- break;
- default:
- test_summarize(ts, WEXITSTATUS(ts->status));
- break;
- }
- return 0;
- } else if (WIFSIGNALED(ts->status)) {
- test_summarize(ts, -WTERMSIG(ts->status));
- return 0;
- } else if (ts->plan != PLAN_FIRST && ts->plan != PLAN_FINAL) {
- puts("ABORTED (no valid test plan)");
- ts->aborted = 1;
- return 0;
- } else {
- test_summarize(ts, 0);
- return (ts->failed == 0);
- }
-}
-
-
-/*
- * Runs a single test set, accumulating and then reporting the results.
- * Returns true if the test set was successfully run and all tests passed,
- * false otherwise.
- */
-static int
-test_run(struct testset *ts)
-{
- pid_t testpid, child;
- int outfd, status;
- unsigned long i;
- FILE *output;
- char buffer[BUFSIZ];
-
- /* Run the test program. */
- testpid = test_start(ts->path, &outfd);
- output = fdopen(outfd, "r");
- if (!output) {
- puts("ABORTED");
- fflush(stdout);
- sysdie("fdopen failed");
- }
-
- /* Pass each line of output to test_checkline(). */
- while (!ts->aborted && fgets(buffer, sizeof(buffer), output))
- test_checkline(buffer, ts);
- if (ferror(output) || ts->plan == PLAN_INIT)
- ts->aborted = 1;
- test_backspace(ts);
-
- /*
- * Consume the rest of the test output, close the output descriptor,
- * retrieve the exit status, and pass that information to test_analyze()
- * for eventual output.
- */
- while (fgets(buffer, sizeof(buffer), output))
- ;
- fclose(output);
- child = waitpid(testpid, &ts->status, 0);
- if (child == (pid_t) -1) {
- if (!ts->reported) {
- puts("ABORTED");
- fflush(stdout);
- }
- sysdie("waitpid for %u failed", (unsigned int) testpid);
- }
- if (ts->all_skipped)
- ts->aborted = 0;
- status = test_analyze(ts);
-
- /* Convert missing tests to failed tests. */
- for (i = 0; i < ts->count; i++) {
- if (ts->results[i] == TEST_INVALID) {
- ts->failed++;
- ts->results[i] = TEST_FAIL;
- status = 0;
- }
- }
- return status;
-}
-
-
-/* Summarize a list of test failures. */
-static void
-test_fail_summary(const struct testlist *fails)
-{
- struct testset *ts;
- unsigned int chars;
- unsigned long i, first, last, total;
-
- puts(header);
-
- /* Failed Set Fail/Total (%) Skip Stat Failing (25)
- -------------------------- -------------- ---- ---- -------------- */
- for (; fails; fails = fails->next) {
- ts = fails->ts;
- total = ts->count - ts->skipped;
- printf("%-26.26s %4lu/%-4lu %3.0f%% %4lu ", ts->file, ts->failed,
- total, total ? (ts->failed * 100.0) / total : 0,
- ts->skipped);
- if (WIFEXITED(ts->status))
- printf("%4d ", WEXITSTATUS(ts->status));
- else
- printf(" -- ");
- if (ts->aborted) {
- puts("aborted");
- continue;
- }
- chars = 0;
- first = 0;
- last = 0;
- for (i = 0; i < ts->count; i++) {
- if (ts->results[i] == TEST_FAIL) {
- if (first != 0 && i == last)
- last = i + 1;
- else {
- if (first != 0)
- chars += test_print_range(first, last, chars, 19);
- first = i + 1;
- last = i + 1;
- }
- }
- }
- if (first != 0)
- test_print_range(first, last, chars, 19);
- putchar('\n');
- }
-}
-
-
-/*
- * Check whether a given file path is a valid test. Currently, this checks
- * whether it is executable and is a regular file. Returns true or false.
- */
-static int
-is_valid_test(const char *path)
-{
- struct stat st;
-
- if (access(path, X_OK) < 0)
- return 0;
- if (stat(path, &st) < 0)
- return 0;
- if (!S_ISREG(st.st_mode))
- return 0;
- return 1;
-}
-
-
-/*
- * Given the name of a test, a pointer to the testset struct, and the source
- * and build directories, find the test. We try first relative to the current
- * directory, then in the build directory (if not NULL), then in the source
- * directory. In each of those directories, we first try a "-t" extension and
- * then a ".t" extension. When we find an executable program, we return the
- * path to that program. If none of those paths are executable, just fill in
- * the name of the test as is.
- *
- * The caller is responsible for freeing the path member of the testset
- * struct.
- */
-static char *
-find_test(const char *name, const char *source, const char *build)
-{
- char *path;
- const char *bases[3], *suffix, *base;
- unsigned int i, j;
- const char *suffixes[3] = { "-t", ".t", "" };
-
- /* Possible base directories. */
- bases[0] = ".";
- bases[1] = build;
- bases[2] = source;
-
- /* Try each suffix with each base. */
- for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
- suffix = suffixes[i];
- for (j = 0; j < ARRAY_SIZE(bases); j++) {
- unsigned int path_len;
-
- base = bases[j];
- if (base == NULL)
- continue;
- path_len = strlen(base) + strlen(name) + strlen(suffix) + 2;
- path = xmalloc(path_len);
- snprintf(path, path_len, "%s/%s%s", base, name, suffix);
- if (is_valid_test(path))
- return path;
- free(path);
- path = NULL;
- }
- }
- if (path == NULL)
- path = xstrdup(name);
- return path;
-}
-
-
-/*
- * Read a list of tests from a file, returning the list of tests as a struct
- * testlist. Reports an error to standard error and exits if the list of
- * tests cannot be read.
- */
-static struct testlist *
-read_test_list(const char *filename)
-{
- FILE *file;
- unsigned int line;
- size_t length;
- char buffer[BUFSIZ];
- struct testlist *listhead, *current;
-
- /* Create the initial container list that will hold our results. */
- listhead = xmalloc(sizeof(struct testlist));
- listhead->ts = NULL;
- listhead->next = NULL;
- current = NULL;
-
- /*
- * Open our file of tests to run and read it line by line, creating a new
- * struct testlist and struct testset for each line.
- */
- file = fopen(filename, "r");
- if (file == NULL)
- sysdie("can't open %s", filename);
- line = 0;
- while (fgets(buffer, sizeof(buffer), file)) {
- line++;
- length = strlen(buffer) - 1;
- if (buffer[length] != '\n') {
- fprintf(stderr, "%s:%u: line too long\n", filename, line);
- exit(1);
- }
- buffer[length] = '\0';
- if (current == NULL)
- current = listhead;
- else {
- current->next = xmalloc(sizeof(struct testlist));
- current = current->next;
- current->next = NULL;
- }
- current->ts = xcalloc(1, sizeof(struct testset));
- current->ts->plan = PLAN_INIT;
- current->ts->file = xstrdup(buffer);
- current->ts->reason = NULL;
- }
- fclose(file);
-
- /* Return the results. */
- return listhead;
-}
-
-
-/*
- * Build a list of tests from command line arguments. Takes the argv and argc
- * representing the command line arguments and returns a newly allocated test
- * list. The caller is responsible for freeing.
- */
-static struct testlist *
-build_test_list(char *argv[], int argc)
-{
- int i;
- struct testlist *listhead, *current;
-
- /* Create the initial container list that will hold our results. */
- listhead = xmalloc(sizeof(struct testlist));
- listhead->ts = NULL;
- listhead->next = NULL;
- current = NULL;
-
- /* Walk the list of arguments and create test sets for them. */
- for (i = 0; i < argc; i++) {
- if (current == NULL)
- current = listhead;
- else {
- current->next = xmalloc(sizeof(struct testlist));
- current = current->next;
- current->next = NULL;
- }
- current->ts = xcalloc(1, sizeof(struct testset));
- current->ts->plan = PLAN_INIT;
- current->ts->file = xstrdup(argv[i]);
- current->ts->reason = NULL;
- }
-
- /* Return the results. */
- return listhead;
-}
-
-
-/* Free a struct testset. */
-static void
-free_testset(struct testset *ts)
-{
- free(ts->file);
- free(ts->path);
- free(ts->results);
- if (ts->reason != NULL)
- free(ts->reason);
- free(ts);
-}
-
-
-/*
- * Run a batch of tests. Takes two additional parameters: the root of the
- * source directory and the root of the build directory. Test programs will
- * be first searched for in the current directory, then the build directory,
- * then the source directory. Returns true iff all tests passed, and always
- * frees the test list that's passed in.
- */
-static int
-test_batch(struct testlist *tests, const char *source, const char *build)
-{
- size_t length;
- unsigned int i;
- unsigned int longest = 0;
- unsigned int count = 0;
- struct testset *ts;
- struct timeval start, end;
- struct rusage stats;
- struct testlist *failhead = NULL;
- struct testlist *failtail = NULL;
- struct testlist *current, *next;
- int succeeded;
- unsigned long total = 0;
- unsigned long passed = 0;
- unsigned long skipped = 0;
- unsigned long failed = 0;
- unsigned long aborted = 0;
-
- /* Walk the list of tests to find the longest name. */
- for (current = tests; current != NULL; current = current->next) {
- length = strlen(current->ts->file);
- if (length > longest)
- longest = length;
- }
-
- /*
- * Add two to longest and round up to the nearest tab stop. This is how
- * wide the column for printing the current test name will be.
- */
- longest += 2;
- if (longest % 8)
- longest += 8 - (longest % 8);
-
- /* Start the wall clock timer. */
- gettimeofday(&start, NULL);
-
- /* Now, plow through our tests again, running each one. */
- for (current = tests; current != NULL; current = current->next) {
- ts = current->ts;
-
- /* Print out the name of the test file. */
- fputs(ts->file, stdout);
- for (i = strlen(ts->file); i < longest; i++)
- putchar('.');
- if (isatty(STDOUT_FILENO))
- fflush(stdout);
-
- /* Run the test. */
- ts->path = find_test(ts->file, source, build);
- succeeded = test_run(ts);
- fflush(stdout);
-
- /* Record cumulative statistics. */
- aborted += ts->aborted;
- total += ts->count + ts->all_skipped;
- passed += ts->passed;
- skipped += ts->skipped + ts->all_skipped;
- failed += ts->failed;
- count++;
-
- /* If the test fails, we shuffle it over to the fail list. */
- if (!succeeded) {
- if (failhead == NULL) {
- failhead = xmalloc(sizeof(struct testset));
- failtail = failhead;
- } else {
- failtail->next = xmalloc(sizeof(struct testset));
- failtail = failtail->next;
- }
- failtail->ts = ts;
- failtail->next = NULL;
- }
- }
- total -= skipped;
-
- /* Stop the timer and get our child resource statistics. */
- gettimeofday(&end, NULL);
- getrusage(RUSAGE_CHILDREN, &stats);
-
- /* Summarize the failures and free the failure list. */
- if (failhead != NULL) {
- test_fail_summary(failhead);
- while (failhead != NULL) {
- next = failhead->next;
- free(failhead);
- failhead = next;
- }
- }
-
- /* Free the memory used by the test lists. */
- while (tests != NULL) {
- next = tests->next;
- free_testset(tests->ts);
- free(tests);
- tests = next;
- }
-
- /* Print out the final test summary. */
- putchar('\n');
- if (aborted != 0) {
- if (aborted == 1)
- printf("Aborted %lu test set", aborted);
- else
- printf("Aborted %lu test sets", aborted);
- printf(", passed %lu/%lu tests", passed, total);
- }
- else if (failed == 0)
- fputs("All tests successful", stdout);
- else
- printf("Failed %lu/%lu tests, %.2f%% okay", failed, total,
- (total - failed) * 100.0 / total);
- if (skipped != 0) {
- if (skipped == 1)
- printf(", %lu test skipped", skipped);
- else
- printf(", %lu tests skipped", skipped);
- }
- puts(".");
- printf("Files=%u, Tests=%lu", count, total);
- printf(", %.2f seconds", tv_diff(&end, &start));
- printf(" (%.2f usr + %.2f sys = %.2f CPU)\n",
- tv_seconds(&stats.ru_utime), tv_seconds(&stats.ru_stime),
- tv_sum(&stats.ru_utime, &stats.ru_stime));
- return (failed == 0 && aborted == 0);
-}
-
-
-/*
- * Run a single test case. This involves just running the test program after
- * having done the environment setup and finding the test program.
- */
-static void
-test_single(const char *program, const char *source, const char *build)
-{
- char *path;
-
- path = find_test(program, source, build);
- if (execl(path, path, (char *) 0) == -1)
- sysdie("cannot exec %s", path);
-}
-
-
-/*
- * Main routine. Set the SOURCE and BUILD environment variables and then,
- * given a file listing tests, run each test listed.
- */
-int
-main(int argc, char *argv[])
-{
- int option;
- int status = 0;
- int single = 0;
- char *source_env = NULL;
- char *build_env = NULL;
- const char *shortlist;
- const char *list = NULL;
- const char *source = SOURCE;
- const char *build = BUILD;
- struct testlist *tests;
-
- while ((option = getopt(argc, argv, "b:hl:os:")) != EOF) {
- switch (option) {
- case 'b':
- build = optarg;
- break;
- case 'h':
- printf(usage_message, argv[0], argv[0], argv[0], usage_extra);
- exit(0);
- break;
- case 'l':
- list = optarg;
- break;
- case 'o':
- single = 1;
- break;
- case 's':
- source = optarg;
- break;
- default:
- exit(1);
- }
- }
- argv += optind;
- argc -= optind;
- if ((list == NULL && argc < 1) || (list != NULL && argc > 0)) {
- fprintf(stderr, usage_message, argv[0], argv[0], argv[0], usage_extra);
- exit(1);
- }
-
- /* Set SOURCE and BUILD environment variables. */
- if (source != NULL) {
- unsigned int len = strlen("SOURCE=") + strlen(source) + 1;
- source_env = xmalloc(len);
- snprintf(source_env, len, "SOURCE=%s", source);
- if (putenv(source_env) != 0)
- sysdie("cannot set SOURCE in the environment");
- }
- if (build != NULL) {
- unsigned int len = strlen("BUILD=") + strlen(build) + 1;
- build_env = xmalloc(len);
- snprintf(build_env, len, "BUILD=%s", build);
- if (putenv(build_env) != 0)
- sysdie("cannot set BUILD in the environment");
- }
-
- /* Run the tests as instructed. */
- if (single)
- test_single(argv[0], source, build);
- else if (list != NULL) {
- shortlist = strrchr(list, '/');
- if (shortlist == NULL)
- shortlist = list;
- else
- shortlist++;
- printf(banner, shortlist);
- tests = read_test_list(list);
- status = test_batch(tests, source, build) ? 0 : 1;
- } else {
- tests = build_test_list(argv, argc);
- status = test_batch(tests, source, build) ? 0 : 1;
- }
-
- /* For valgrind cleanliness, free all our memory. */
- if (source_env != NULL) {
- putenv((char *) "SOURCE=");
- free(source_env);
- }
- if (build_env != NULL) {
- putenv((char *) "BUILD=");
- free(build_env);
- }
- exit(status);
-}
diff --git a/src/zscanner/tests/tap/libtap.sh b/src/zscanner/tests/tap/libtap.sh
deleted file mode 100644
index 0ffab2d238c50d8cf06d1e96fac46171b890f363..0000000000000000000000000000000000000000
--- a/src/zscanner/tests/tap/libtap.sh
+++ /dev/null
@@ -1,246 +0,0 @@
-# Shell function library for test cases.
-#
-# Note that while many of the functions in this library could benefit from
-# using "local" to avoid possibly hammering global variables, Solaris /bin/sh
-# doesn't support local and this library aspires to be portable to Solaris
-# Bourne shell. Instead, all private variables are prefixed with "tap_".
-#
-# This file provides a TAP-compatible shell function library useful for
-# writing test cases. It is part of C TAP Harness, which can be found at
-# <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
-#
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2009, 2010, 2011, 2012 Russ Allbery <rra@stanford.edu>
-# Copyright 2006, 2007, 2008, 2013
-# The Board of Trustees of the Leland Stanford Junior University
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-# Print out the number of test cases we expect to run.
-plan () {
- count=1
- planned="$1"
- failed=0
- echo "1..$1"
- trap finish 0
-}
-
-# Prepare for lazy planning.
-plan_lazy () {
- count=1
- planned=0
- failed=0
- trap finish 0
-}
-
-# Report the test status on exit.
-finish () {
- tap_highest=`expr "$count" - 1`
- if [ "$planned" = 0 ] ; then
- echo "1..$tap_highest"
- planned="$tap_highest"
- fi
- tap_looks='# Looks like you'
- if [ "$planned" -gt 0 ] ; then
- if [ "$planned" -gt "$tap_highest" ] ; then
- if [ "$planned" -gt 1 ] ; then
- echo "$tap_looks planned $planned tests but only ran" \
- "$tap_highest"
- else
- echo "$tap_looks planned $planned test but only ran" \
- "$tap_highest"
- fi
- elif [ "$planned" -lt "$tap_highest" ] ; then
- tap_extra=`expr "$tap_highest" - "$planned"`
- if [ "$planned" -gt 1 ] ; then
- echo "$tap_looks planned $planned tests but ran" \
- "$tap_extra extra"
- else
- echo "$tap_looks planned $planned test but ran" \
- "$tap_extra extra"
- fi
- elif [ "$failed" -gt 0 ] ; then
- if [ "$failed" -gt 1 ] ; then
- echo "$tap_looks failed $failed tests of $planned"
- else
- echo "$tap_looks failed $failed test of $planned"
- fi
- elif [ "$planned" -gt 1 ] ; then
- echo "# All $planned tests successful or skipped"
- else
- echo "# $planned test successful or skipped"
- fi
- fi
-}
-
-# Skip the entire test suite. Should be run instead of plan.
-skip_all () {
- tap_desc="$1"
- if [ -n "$tap_desc" ] ; then
- echo "1..0 # skip $tap_desc"
- else
- echo "1..0 # skip"
- fi
- exit 0
-}
-
-# ok takes a test description and a command to run and prints success if that
-# command is successful, false otherwise. The count starts at 1 and is
-# updated each time ok is printed.
-ok () {
- tap_desc="$1"
- if [ -n "$tap_desc" ] ; then
- tap_desc=" - $tap_desc"
- fi
- shift
- if "$@" ; then
- echo ok "$count$tap_desc"
- else
- echo not ok "$count$tap_desc"
- failed=`expr $failed + 1`
- fi
- count=`expr $count + 1`
-}
-
-# Skip the next test. Takes the reason why the test is skipped.
-skip () {
- echo "ok $count # skip $*"
- count=`expr $count + 1`
-}
-
-# Report the same status on a whole set of tests. Takes the count of tests,
-# the description, and then the command to run to determine the status.
-ok_block () {
- tap_i=$count
- tap_end=`expr $count + $1`
- shift
- while [ "$tap_i" -lt "$tap_end" ] ; do
- ok "$@"
- tap_i=`expr $tap_i + 1`
- done
-}
-
-# Skip a whole set of tests. Takes the count and then the reason for skipping
-# the test.
-skip_block () {
- tap_i=$count
- tap_end=`expr $count + $1`
- shift
- while [ "$tap_i" -lt "$tap_end" ] ; do
- skip "$@"
- tap_i=`expr $tap_i + 1`
- done
-}
-
-# Portable variant of printf '%s\n' "$*". In the majority of cases, this
-# function is slower than printf, because the latter is often implemented
-# as a builtin command. The value of the variable IFS is ignored.
-#
-# This macro must not be called via backticks inside double quotes, since this
-# will result in bizarre escaping behavior and lots of extra backslashes on
-# Solaris.
-puts () {
- cat << EOH
-$@
-EOH
-}
-
-# Run a program expected to succeed, and print ok if it does and produces the
-# correct output. Takes the description, expected exit status, the expected
-# output, the command to run, and then any arguments for that command.
-# Standard output and standard error are combined when analyzing the output of
-# the command.
-#
-# If the command may contain system-specific error messages in its output,
-# add strip_colon_error before the command to post-process its output.
-ok_program () {
- tap_desc="$1"
- shift
- tap_w_status="$1"
- shift
- tap_w_output="$1"
- shift
- tap_output=`"$@" 2>&1`
- tap_status=$?
- if [ $tap_status = $tap_w_status ] \
- && [ x"$tap_output" = x"$tap_w_output" ] ; then
- ok "$tap_desc" true
- else
- echo "# saw: ($tap_status) $tap_output"
- echo "# not: ($tap_w_status) $tap_w_output"
- ok "$tap_desc" false
- fi
-}
-
-# Strip a colon and everything after it off the output of a command, as long
-# as that colon comes after at least one whitespace character. (This is done
-# to avoid stripping the name of the program from the start of an error
-# message.) This is used to remove system-specific error messages (coming
-# from strerror, for example).
-strip_colon_error() {
- tap_output=`"$@" 2>&1`
- tap_status=$?
- tap_output=`puts "$tap_output" | sed 's/^\([^ ]* [^:]*\):.*/\1/'`
- puts "$tap_output"
- return $tap_status
-}
-
-# Bail out with an error message.
-bail () {
- echo 'Bail out!' "$@"
- exit 255
-}
-
-# Output a diagnostic on standard error, preceded by the required # mark.
-diag () {
- echo '#' "$@"
-}
-
-# Search for the given file first in $BUILD and then in $SOURCE and echo the
-# path where the file was found, or the empty string if the file wasn't
-# found.
-#
-# This macro uses puts, so don't run it using backticks inside double quotes
-# or bizarre quoting behavior will happen with Solaris sh.
-test_file_path () {
- if [ -n "$BUILD" ] && [ -f "$BUILD/$1" ] ; then
- puts "$BUILD/$1"
- elif [ -n "$SOURCE" ] && [ -f "$SOURCE/$1" ] ; then
- puts "$SOURCE/$1"
- else
- echo ''
- fi
-}
-
-# Create $BUILD/tmp for use by tests for storing temporary files and return
-# the path (via standard output).
-#
-# This macro uses puts, so don't run it using backticks inside double quotes
-# or bizarre quoting behavior will happen with Solaris sh.
-test_tmpdir () {
- if [ -z "$BUILD" ] ; then
- tap_tmpdir="./tmp"
- else
- tap_tmpdir="$BUILD"/tmp
- fi
- if [ ! -d "$tap_tmpdir" ] ; then
- mkdir "$tap_tmpdir" || bail "Error creating $tap_tmpdir"
- fi
- puts "$tap_tmpdir"
-}
diff --git a/src/zscanner/tests/zscanner.sh b/src/zscanner/tests/unittests.in
old mode 100755
new mode 100644
similarity index 77%
rename from src/zscanner/tests/zscanner.sh
rename to src/zscanner/tests/unittests.in
index ac3ce92b679816c99811eb721f6d715ced3ca484..846f3511efb2bc7965ae13f73d314bf1b619f21a
--- a/src/zscanner/tests/zscanner.sh
+++ b/src/zscanner/tests/unittests.in
@@ -1,6 +1,10 @@
#!/bin/sh
-. "$SOURCE"/tap/libtap.sh
+SOURCE=@top_srcdir@/src/zscanner/tests
+BUILD=@top_builddir@/src/zscanner/tests
+
+. @top_srcdir@/libtap/tap/libtap.sh
+
cd "$BUILD"
TMPDIR=$(test_tmpdir)
@@ -14,13 +18,13 @@ for a in 1 2 3 4 5 6; do
cat "$TESTS_DIR"/includes/include"$a" > "$TMPDIR"/includes/include"$a";
done
-for case in $(cat "$SOURCE"/zscanner-TESTS); do
+for case in $(cat "$SOURCE"/TESTS); do
casein=$(test_file_path data/"$case".in)
caseout=$(test_file_path data/"$case".out)
filein="$TMPDIR"/"$case".in
fileout="$TMPDIR"/"$case".out
- sed -e "s|@TMPDIR@|$TMPDIR|;s|@SOURCE@|$SOURCE|;" < "$casein" > "$filein"
+ sed -e "s|@TMPDIR@|$TMPDIR|;" < "$casein" > "$filein"
diag $(ls "$filein")
"$ZSCANNER_TOOL" -m 2 . "$filein" > "$fileout"
diff --git a/src/zscanner/tests/zscanner-TESTS b/src/zscanner/tests/zscanner-TESTS
deleted file mode 100644
index c88aef1e3a199e8385f313810c6ef9f3d6001cb0..0000000000000000000000000000000000000000
--- a/src/zscanner/tests/zscanner-TESTS
+++ /dev/null
@@ -1,68 +0,0 @@
-00-0_general
-00-1_general
-01_owner
-02_class
-03_rrttl
-04-0_ORIGIN
-04-1_ORIGIN
-04-2_ORIGIN
-04-3_ORIGIN
-04-4_ORIGIN
-04-5_ORIGIN
-04-6_ORIGIN
-04-7_ORIGIN
-04-8_ORIGIN
-04-9_ORIGIN
-05-0_TTL
-05-1_TTL
-05-2_TTL
-05-3_TTL
-05-4_TTL
-06-0_INCLUDE
-06-1_INCLUDE
-06-2_INCLUDE
-06-3_INCLUDE
-06-4_INCLUDE
-06-5_INCLUDE
-06-6_INCLUDE
-06-7_INCLUDE
-06-8_INCLUDE
-10_A
-11_AAAA
-12_TXT
-13_SPF
-14_NS
-15_CNAME
-16_PTR
-17_DNAME
-18_MX
-19_AFSDB
-20_RT
-21_KX
-22_HINFO
-23_MINFO
-24_RP
-25_SOA
-26_SRV
-27_NAPTR
-28_TYPE
-29_CERT
-30_KEY
-31_DNSKEY
-32_APL
-33_DS
-34_SSHFP
-35_IPSECKEY
-36_RRSIG
-37_NSEC
-38_DHCID
-39_NSEC3
-40_NSEC3PARAM
-41_TLSA
-42_LOC
-43_EUI48
-44_EUI64
-45_NID
-46_L32
-47_L64
-48_LP