Move all externally maintained source files into src/ext

The rationale for treating these files differently is that we should
be checking upstream for changes as applicable, and merging changes
upstream as warranted.

5 files changed, 2 insertions, 878 deletions

diff --git a/src/test/include.am b/src/test/include.am
index 03fef23375..bdfe498d66 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -5,7 +5,7 @@ noinst_PROGRAMS+= src/test/test src/test/test-child src/test/bench
 src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
         -DLOCALSTATEDIR="\"$(localstatedir)\"" \
         -DBINDIR="\"$(bindir)\""	       \
-	-I"$(top_srcdir)/src/or"
+	-I"$(top_srcdir)/src/or" -I"$(top_srcdir)/src/ext"
 
 # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
 # This seems to matter nowhere but on Windows, but I assure you that it
@@ -24,7 +24,7 @@ src_test_test_SOURCES = \
 	src/test/test_replay.c \
 	src/test/test_util.c \
 	src/test/test_config.c \
-	src/test/tinytest.c
+	src/ext/tinytest.c
 
 src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS)
 
@@ -48,8 +48,5 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypt
 	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
 
 noinst_HEADERS+= \
-	src/test/tinytest.h \
-	src/test/tinytest_macros.h \
 	src/test/test.h
 
-
diff --git a/src/test/tinytest.c b/src/test/tinytest.c
deleted file mode 100644
index 4d9afacce4..0000000000
--- a/src/test/tinytest.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* tinytest.c -- Copyright 2009-2012 Nick Mathewson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifdef TINYTEST_LOCAL
-#include "tinytest_local.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#endif
-
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif
-
-#include "tinytest.h"
-#include "tinytest_macros.h"
-
-#define LONGEST_TEST_NAME 16384
-
-static int in_tinytest_main = 0; /**< true if we're in tinytest_main().*/
-static int n_ok = 0; /**< Number of tests that have passed */
-static int n_bad = 0; /**< Number of tests that have failed. */
-static int n_skipped = 0; /**< Number of tests that have been skipped. */
-
-static int opt_forked = 0; /**< True iff we're called from inside a win32 fork*/
-static int opt_nofork = 0; /**< Suppress calls to fork() for debugging. */
-static int opt_verbosity = 1; /**< -==quiet,0==terse,1==normal,2==verbose */
-const char *verbosity_flag = "";
-
-enum outcome { SKIP=2, OK=1, FAIL=0 };
-static enum outcome cur_test_outcome = 0;
-const char *cur_test_prefix = NULL; /**< prefix of the current test group */
-/** Name of the current test, if we haven't logged is yet. Used for --quiet */
-const char *cur_test_name = NULL;
-
-#ifdef _WIN32
-/* Copy of argv[0] for win32. */
-static char commandname[MAX_PATH+1];
-#endif
-
-static void usage(struct testgroup_t *groups, int list_groups)
-  __attribute__((noreturn));
-
-static enum outcome
-testcase_run_bare_(const struct testcase_t *testcase)
-{
-	void *env = NULL;
-	int outcome;
-	if (testcase->setup) {
-		env = testcase->setup->setup_fn(testcase);
-		if (!env)
-			return FAIL;
-		else if (env == (void*)TT_SKIP)
-			return SKIP;
-	}
-
-	cur_test_outcome = OK;
-	testcase->fn(env);
-	outcome = cur_test_outcome;
-
-	if (testcase->setup) {
-		if (testcase->setup->cleanup_fn(testcase, env) == 0)
-			outcome = FAIL;
-	}
-
-	return outcome;
-}
-
-#define MAGIC_EXITCODE 42
-
-static enum outcome
-testcase_run_forked_(const struct testgroup_t *group,
-		     const struct testcase_t *testcase)
-{
-#ifdef _WIN32
-	/* Fork? On Win32?  How primitive!  We'll do what the smart kids do:
-	   we'll invoke our own exe (whose name we recall from the command
-	   line) with a command line that tells it to run just the test we
-	   want, and this time without forking.
-
-	   (No, threads aren't an option.  The whole point of forking is to
-	   share no state between tests.)
-	 */
-	int ok;
-	char buffer[LONGEST_TEST_NAME+256];
-	STARTUPINFOA si;
-	PROCESS_INFORMATION info;
-	DWORD exitcode;
-
-	if (!in_tinytest_main) {
-		printf("\nERROR.  On Windows, testcase_run_forked_ must be"
-		       " called from within tinytest_main.\n");
-		abort();
-	}
-	if (opt_verbosity>0)
-		printf("[forking] ");
-
-	snprintf(buffer, sizeof(buffer), "%s --RUNNING-FORKED %s %s%s",
-		 commandname, verbosity_flag, group->prefix, testcase->name);
-
-	memset(&si, 0, sizeof(si));
-	memset(&info, 0, sizeof(info));
-	si.cb = sizeof(si);
-
-	ok = CreateProcessA(commandname, buffer, NULL, NULL, 0,
-			   0, NULL, NULL, &si, &info);
-	if (!ok) {
-		printf("CreateProcess failed!\n");
-		return 0;
-	}
-	WaitForSingleObject(info.hProcess, INFINITE);
-	GetExitCodeProcess(info.hProcess, &exitcode);
-	CloseHandle(info.hProcess);
-	CloseHandle(info.hThread);
-	if (exitcode == 0)
-		return OK;
-	else if (exitcode == MAGIC_EXITCODE)
-		return SKIP;
-	else
-		return FAIL;
-#else
-	int outcome_pipe[2];
-	pid_t pid;
-	(void)group;
-
-	if (pipe(outcome_pipe))
-		perror("opening pipe");
-
-	if (opt_verbosity>0)
-		printf("[forking] ");
-	pid = fork();
-	if (!pid) {
-		/* child. */
-		int test_r, write_r;
-		char b[1];
-		close(outcome_pipe[0]);
-		test_r = testcase_run_bare_(testcase);
-		assert(0<=(int)test_r && (int)test_r<=2);
-		b[0] = "NYS"[test_r];
-		write_r = (int)write(outcome_pipe[1], b, 1);
-		if (write_r != 1) {
-			perror("write outcome to pipe");
-			exit(1);
-		}
-		exit(0);
-		return FAIL; /* unreachable */
-	} else {
-		/* parent */
-		int status, r;
-		char b[1];
-		/* Close this now, so that if the other side closes it,
-		 * our read fails. */
-		close(outcome_pipe[1]);
-		r = (int)read(outcome_pipe[0], b, 1);
-		if (r == 0) {
-			printf("[Lost connection!] ");
-			return 0;
-		} else if (r != 1) {
-			perror("read outcome from pipe");
-		}
-		waitpid(pid, &status, 0);
-		close(outcome_pipe[0]);
-		return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL);
-	}
-#endif
-}
-
-int
-testcase_run_one(const struct testgroup_t *group,
-		 const struct testcase_t *testcase)
-{
-	enum outcome outcome;
-
-	if (testcase->flags & TT_SKIP) {
-		if (opt_verbosity>0)
-			printf("%s%s: SKIPPED\n",
-			    group->prefix, testcase->name);
-		++n_skipped;
-		return SKIP;
-	}
-
-	if (opt_verbosity>0 && !opt_forked) {
-		printf("%s%s: ", group->prefix, testcase->name);
-	} else {
-		if (opt_verbosity==0) printf(".");
-		cur_test_prefix = group->prefix;
-		cur_test_name = testcase->name;
-	}
-
-	if ((testcase->flags & TT_FORK) && !(opt_forked||opt_nofork)) {
-		outcome = testcase_run_forked_(group, testcase);
-	} else {
-		outcome = testcase_run_bare_(testcase);
-	}
-
-	if (outcome == OK) {
-		++n_ok;
-		if (opt_verbosity>0 && !opt_forked)
-			puts(opt_verbosity==1?"OK":"");
-	} else if (outcome == SKIP) {
-		++n_skipped;
-		if (opt_verbosity>0 && !opt_forked)
-			puts("SKIPPED");
-	} else {
-		++n_bad;
-		if (!opt_forked)
-			printf("\n  [%s FAILED]\n", testcase->name);
-	}
-
-	if (opt_forked) {
-		exit(outcome==OK ? 0 : (outcome==SKIP?MAGIC_EXITCODE : 1));
-		return 1; /* unreachable */
-	} else {
-		return (int)outcome;
-	}
-}
-
-int
-tinytest_set_flag_(struct testgroup_t *groups, const char *arg, unsigned long flag)
-{
-	int i, j;
-	size_t length = LONGEST_TEST_NAME;
-	char fullname[LONGEST_TEST_NAME];
-	int found=0;
-	if (strstr(arg, ".."))
-		length = strstr(arg,"..")-arg;
-	for (i=0; groups[i].prefix; ++i) {
-		for (j=0; groups[i].cases[j].name; ++j) {
-			snprintf(fullname, sizeof(fullname), "%s%s",
-				 groups[i].prefix, groups[i].cases[j].name);
-			if (!flag) /* Hack! */
-				printf("    %s\n", fullname);
-			if (!strncmp(fullname, arg, length)) {
-				groups[i].cases[j].flags |= flag;
-				++found;
-			}
-		}
-	}
-	return found;
-}
-
-static void
-usage(struct testgroup_t *groups, int list_groups)
-{
-	puts("Options are: [--verbose|--quiet|--terse] [--no-fork]");
-	puts("  Specify tests by name, or using a prefix ending with '..'");
-	puts("  To skip a test, list give its name prefixed with a colon.");
-	puts("  Use --list-tests for a list of tests.");
-	if (list_groups) {
-		puts("Known tests are:");
-		tinytest_set_flag_(groups, "..", 0);
-	}
-	exit(0);
-}
-
-int
-tinytest_main(int c, const char **v, struct testgroup_t *groups)
-{
-	int i, j, n=0;
-
-#ifdef _WIN32
-	const char *sp = strrchr(v[0], '.');
-	const char *extension = "";
-	if (!sp || stricmp(sp, ".exe"))
-		extension = ".exe"; /* Add an exe so CreateProcess will work */
-	snprintf(commandname, sizeof(commandname), "%s%s", v[0], extension);
-	commandname[MAX_PATH]='\0';
-#endif
-	for (i=1; i<c; ++i) {
-		if (v[i][0] == '-') {
-			if (!strcmp(v[i], "--RUNNING-FORKED")) {
-				opt_forked = 1;
-			} else if (!strcmp(v[i], "--no-fork")) {
-				opt_nofork = 1;
-			} else if (!strcmp(v[i], "--quiet")) {
-				opt_verbosity = -1;
-				verbosity_flag = "--quiet";
-			} else if (!strcmp(v[i], "--verbose")) {
-				opt_verbosity = 2;
-				verbosity_flag = "--verbose";
-			} else if (!strcmp(v[i], "--terse")) {
-				opt_verbosity = 0;
-				verbosity_flag = "--terse";
-			} else if (!strcmp(v[i], "--help")) {
-				usage(groups, 0);
-			} else if (!strcmp(v[i], "--list-tests")) {
-				usage(groups, 1);
-			} else {
-				printf("Unknown option %s.  Try --help\n",v[i]);
-				return -1;
-			}
-		} else {
-			const char *test = v[i];
-			int flag = TT_ENABLED_;
-			if (test[0] == ':') {
-				++test;
-				flag = TT_SKIP;
-			} else {
-				++n;
-			}
-			if (!tinytest_set_flag_(groups, test, flag)) {
-				printf("No such test as %s!\n", v[i]);
-				return -1;
-			}
-		}
-	}
-	if (!n)
-		tinytest_set_flag_(groups, "..", TT_ENABLED_);
-
-	setvbuf(stdout, NULL, _IONBF, 0);
-
-	++in_tinytest_main;
-	for (i=0; groups[i].prefix; ++i)
-		for (j=0; groups[i].cases[j].name; ++j)
-			if (groups[i].cases[j].flags & TT_ENABLED_)
-				testcase_run_one(&groups[i],
-						 &groups[i].cases[j]);
-
-	--in_tinytest_main;
-
-	if (opt_verbosity==0)
-		puts("");
-
-	if (n_bad)
-		printf("%d/%d TESTS FAILED. (%d skipped)\n", n_bad,
-		       n_bad+n_ok,n_skipped);
-	else if (opt_verbosity >= 1)
-		printf("%d tests ok.  (%d skipped)\n", n_ok, n_skipped);
-
-	return (n_bad == 0) ? 0 : 1;
-}
-
-int
-tinytest_get_verbosity_(void)
-{
-	return opt_verbosity;
-}
-
-void
-tinytest_set_test_failed_(void)
-{
-	if (opt_verbosity <= 0 && cur_test_name) {
-		if (opt_verbosity==0) puts("");
-		printf("%s%s: ", cur_test_prefix, cur_test_name);
-		cur_test_name = NULL;
-	}
-	cur_test_outcome = 0;
-}
-
-void
-tinytest_set_test_skipped_(void)
-{
-	if (cur_test_outcome==OK)
-		cur_test_outcome = SKIP;
-}
-
diff --git a/src/test/tinytest.h b/src/test/tinytest.h
deleted file mode 100644
index bcac9f079c..0000000000
--- a/src/test/tinytest.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* tinytest.h -- Copyright 2009-2012 Nick Mathewson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TINYTEST_H_INCLUDED_
-#define TINYTEST_H_INCLUDED_
-
-/** Flag for a test that needs to run in a subprocess. */
-#define TT_FORK  (1<<0)
-/** Runtime flag for a test we've decided to skip. */
-#define TT_SKIP  (1<<1)
-/** Internal runtime flag for a test we've decided to run. */
-#define TT_ENABLED_  (1<<2)
-/** If you add your own flags, make them start at this point. */
-#define TT_FIRST_USER_FLAG (1<<3)
-
-typedef void (*testcase_fn)(void *);
-
-struct testcase_t;
-
-/** Functions to initialize/teardown a structure for a testcase. */
-struct testcase_setup_t {
-	/** Return a new structure for use by a given testcase. */
-	void *(*setup_fn)(const struct testcase_t *);
-	/** Clean/free a structure from setup_fn. Return 1 if ok, 0 on err. */
-	int (*cleanup_fn)(const struct testcase_t *, void *);
-};
-
-/** A single test-case that you can run. */
-struct testcase_t {
-	const char *name; /**< An identifier for this case. */
-	testcase_fn fn; /**< The function to run to implement this case. */
-	unsigned long flags; /**< Bitfield of TT_* flags. */
-	const struct testcase_setup_t *setup; /**< Optional setup/cleanup fns*/
-	void *setup_data; /**< Extra data usable by setup function */
-};
-#define END_OF_TESTCASES { NULL, NULL, 0, NULL, NULL }
-
-/** A group of tests that are selectable together. */
-struct testgroup_t {
-	const char *prefix; /**< Prefix to prepend to testnames. */
-	struct testcase_t *cases; /** Array, ending with END_OF_TESTCASES */
-};
-#define END_OF_GROUPS { NULL, NULL}
-
-/** Implementation: called from a test to indicate failure, before logging. */
-void tinytest_set_test_failed_(void);
-/** Implementation: called from a test to indicate that we're skipping. */
-void tinytest_set_test_skipped_(void);
-/** Implementation: return 0 for quiet, 1 for normal, 2 for loud. */
-int tinytest_get_verbosity_(void);
-/** Implementation: Set a flag on tests matching a name; returns number
- * of tests that matched. */
-int tinytest_set_flag_(struct testgroup_t *, const char *, unsigned long);
-
-/** Set all tests in 'groups' matching the name 'named' to be skipped. */
-#define tinytest_skip(groups, named) \
-	tinytest_set_flag_(groups, named, TT_SKIP)
-
-/** Run a single testcase in a single group. */
-int testcase_run_one(const struct testgroup_t *,const struct testcase_t *);
-/** Run a set of testcases from an END_OF_GROUPS-terminated array of groups,
-    as selected from the command line. */
-int tinytest_main(int argc, const char **argv, struct testgroup_t *groups);
-
-#endif
diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c
deleted file mode 100644
index be95ce4c1d..0000000000
--- a/src/test/tinytest_demo.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* tinytest_demo.c -- Copyright 2009-2012 Nick Mathewson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-/* Welcome to the example file for tinytest!  I'll show you how to set up
- * some simple and not-so-simple testcases. */
-
-/* Make sure you include these headers. */
-#include "tinytest.h"
-#include "tinytest_macros.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/* ============================================================ */
-
-/* First, let's see if strcmp is working.  (All your test cases should be
- * functions declared to take a single void * as an argument.) */
-void
-test_strcmp(void *data)
-{
-	(void)data; /* This testcase takes no data. */
-
-	/* Let's make sure the empty string is equal to itself */
-	if (strcmp("","")) {
-		/* This macro tells tinytest to stop the current test
-		 * and go straight to the "end" label. */
-		tt_abort_msg("The empty string was not equal to itself");
-	}
-
-	/* Pretty often, calling tt_abort_msg to indicate failure is more
-	   heavy-weight than you want.	Instead, just say: */
-	tt_assert(strcmp("testcase", "testcase") == 0);
-
-	/* Occasionally, you don't want to stop the current testcase just
-	   because a single assertion has failed.  In that case, use
-	   tt_want: */
-	tt_want(strcmp("tinytest", "testcase") > 0);
-
-	/* You can use the tt_*_op family of macros to compare values and to
-	   fail unless they have the relationship you want.  They produce
-	   more useful output than tt_assert, since they display the actual
-	   values of the failing things.
-
-	   Fail unless strcmp("abc, "abc") == 0 */
-	tt_int_op(strcmp("abc", "abc"), ==, 0);
-
-	/* Fail unless strcmp("abc, "abcd") is less than 0 */
-	tt_int_op(strcmp("abc", "abcd"), < , 0);
-
-	/* Incidentally, there's a test_str_op that uses strcmp internally. */
-	tt_str_op("abc", <, "abcd");
-
-
-	/* Every test-case function needs to finish with an "end:"
-	   label and (optionally) code to clean up local variables. */
- end:
-	;
-}
-
-/* ============================================================ */
-
-/* Now let's mess with setup and teardown functions!  These are handy if
-   you have a bunch of tests that all need a similar environment, and you
-   want to reconstruct that environment freshly for each one. */
-
-/* First you declare a type to hold the environment info, and functions to
-   set it up and tear it down. */
-struct data_buffer {
-	/* We're just going to have couple of character buffer.	 Using
-	   setup/teardown functions is probably overkill for this case.
-
-	   You could also do file descriptors, complicated handles, temporary
-	   files, etc. */
-	char buffer1[512];
-	char buffer2[512];
-};
-/* The setup function needs to take a const struct testcase_t and return
-   void* */
-void *
-setup_data_buffer(const struct testcase_t *testcase)
-{
-	struct data_buffer *db = malloc(sizeof(struct data_buffer));
-
-	/* If you had a complicated set of setup rules, you might behave
-	   differently here depending on testcase->flags or
-	   testcase->setup_data or even or testcase->name. */
-
-	/* Returning a NULL here would mean that we couldn't set up for this
-	   test, so we don't need to test db for null. */
-	return db;
-}
-/* The clean function deallocates storage carefully and returns true on
-   success. */
-int
-clean_data_buffer(const struct testcase_t *testcase, void *ptr)
-{
-	struct data_buffer *db = ptr;
-
-	if (db) {
-		free(db);
-		return 1;
-	}
-	return 0;
-}
-/* Finally, declare a testcase_setup_t with these functions. */
-struct testcase_setup_t data_buffer_setup = {
-	setup_data_buffer, clean_data_buffer
-};
-
-
-/* Now let's write our test. */
-void
-test_memcpy(void *ptr)
-{
-	/* This time, we use the argument. */
-	struct data_buffer *db = ptr;
-
-	/* We'll also introduce a local variable that might need cleaning up. */
-	char *mem = NULL;
-
-	/* Let's make sure that memcpy does what we'd like. */
-	strcpy(db->buffer1, "String 0");
-	memcpy(db->buffer2, db->buffer1, sizeof(db->buffer1));
-	tt_str_op(db->buffer1, ==, db->buffer2);
-
-	/* Now we've allocated memory that's referenced by a local variable.
-	   The end block of the function will clean it up. */
-	mem = strdup("Hello world.");
-	tt_assert(mem);
-
-	/* Another rather trivial test. */
-	tt_str_op(db->buffer1, !=, mem);
-
- end:
-	/* This time our end block has something to do. */
-	if (mem)
-		free(mem);
-}
-
-/* ============================================================ */
-
-/* Now we need to make sure that our tests get invoked.	  First, you take
-   a bunch of related tests and put them into an array of struct testcase_t.
-*/
-
-struct testcase_t demo_tests[] = {
-	/* Here's a really simple test: it has a name you can refer to it
-	   with, and a function to invoke it. */
-	{ "strcmp", test_strcmp, },
-
-	/* The second test has a flag, "TT_FORK", to make it run in a
-	   subprocess, and a pointer to the testcase_setup_t that configures
-	   its environment. */
-	{ "memcpy", test_memcpy, TT_FORK, &data_buffer_setup },
-
-	/* The array has to end with END_OF_TESTCASES. */
-	END_OF_TESTCASES
-};
-
-/* Next, we make an array of testgroups.  This is mandatory.  Unlike more
-   heavy-duty testing frameworks, groups can't nest. */
-struct testgroup_t groups[] = {
-
-	/* Every group has a 'prefix', and an array of tests.  That's it. */
-	{ "demo/", demo_tests },
-
-	END_OF_GROUPS
-};
-
-
-int
-main(int c, const char **v)
-{
-	/* Finally, just call tinytest_main().	It lets you specify verbose
-	   or quiet output with --verbose and --quiet.	You can list
-	   specific tests:
-
-	       tinytest-demo demo/memcpy
-
-	   or use a ..-wildcard to select multiple tests with a common
-	   prefix:
-
-	       tinytest-demo demo/..
-
-	   If you list no tests, you get them all by default, so that
-	   "tinytest-demo" and "tinytest-demo .." mean the same thing.
-
-	*/
-	return tinytest_main(c, v, groups);
-}
diff --git a/src/test/tinytest_macros.h b/src/test/tinytest_macros.h
deleted file mode 100644
index 9ff69b1d50..0000000000
--- a/src/test/tinytest_macros.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* tinytest_macros.h -- Copyright 2009-2012 Nick Mathewson
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TINYTEST_MACROS_H_INCLUDED_
-#define TINYTEST_MACROS_H_INCLUDED_
-
-/* Helpers for defining statement-like macros */
-#define TT_STMT_BEGIN do {
-#define TT_STMT_END } while (0)
-
-/* Redefine this if your test functions want to abort with something besides
- * "goto end;" */
-#ifndef TT_EXIT_TEST_FUNCTION
-#define TT_EXIT_TEST_FUNCTION TT_STMT_BEGIN goto end; TT_STMT_END
-#endif
-
-/* Redefine this if you want to note success/failure in some different way. */
-#ifndef TT_DECLARE
-#define TT_DECLARE(prefix, args)				\
-	TT_STMT_BEGIN						\
-	printf("\n  %s %s:%d: ",prefix,__FILE__,__LINE__);	\
-	printf args ;						\
-	TT_STMT_END
-#endif
-
-/* Announce a failure. Args are parenthesized printf args. */
-#define TT_GRIPE(args) TT_DECLARE("FAIL", args)
-
-/* Announce a non-failure if we're verbose. */
-#define TT_BLATHER(args)						\
-	TT_STMT_BEGIN							\
-	if (tinytest_get_verbosity_()>1) TT_DECLARE("  OK", args);	\
-	TT_STMT_END
-
-#define TT_DIE(args)						\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_failed_();				\
-	TT_GRIPE(args);						\
-	TT_EXIT_TEST_FUNCTION;					\
-	TT_STMT_END
-
-#define TT_FAIL(args)				\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_failed_();				\
-	TT_GRIPE(args);						\
-	TT_STMT_END
-
-/* Fail and abort the current test for the reason in msg */
-#define tt_abort_printf(msg) TT_DIE(msg)
-#define tt_abort_perror(op) TT_DIE(("%s: %s [%d]",(op),strerror(errno), errno))
-#define tt_abort_msg(msg) TT_DIE(("%s", msg))
-#define tt_abort() TT_DIE(("%s", "(Failed.)"))
-
-/* Fail but do not abort the current test for the reason in msg. */
-#define tt_failprint_f(msg) TT_FAIL(msg)
-#define tt_fail_perror(op) TT_FAIL(("%s: %s [%d]",(op),strerror(errno), errno))
-#define tt_fail_msg(msg) TT_FAIL(("%s", msg))
-#define tt_fail() TT_FAIL(("%s", "(Failed.)"))
-
-/* End the current test, and indicate we are skipping it. */
-#define tt_skip()						\
-	TT_STMT_BEGIN						\
-	tinytest_set_test_skipped_();				\
-	TT_EXIT_TEST_FUNCTION;					\
-	TT_STMT_END
-
-#define tt_want_(b, msg, fail)				\
-	TT_STMT_BEGIN					\
-	if (!(b)) {					\
-		tinytest_set_test_failed_();		\
-		TT_GRIPE(("%s",msg));			\
-		fail;					\
-	} else {					\
-		TT_BLATHER(("%s",msg));			\
-	}						\
-	TT_STMT_END
-
-/* Assert b, but do not stop the test if b fails.  Log msg on failure. */
-#define tt_want_msg(b, msg)			\
-	tt_want_(b, msg, );
-
-/* Assert b and stop the test if b fails.  Log msg on failure. */
-#define tt_assert_msg(b, msg)			\
-	tt_want_(b, msg, TT_EXIT_TEST_FUNCTION);
-
-/* Assert b, but do not stop the test if b fails. */
-#define tt_want(b)   tt_want_msg( (b), "want("#b")")
-/* Assert b, and stop the test if b fails. */
-#define tt_assert(b) tt_assert_msg((b), "assert("#b")")
-
-#define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \
-    setup_block,cleanup_block,die_on_fail)				\
-	TT_STMT_BEGIN							\
-	type val1_ = (type)(a);						\
-	type val2_ = (type)(b);						\
-	int tt_status_ = (test);					\
-	if (!tt_status_ || tinytest_get_verbosity_()>1)	{		\
-		printf_type print_;					\
-		printf_type print1_;					\
-		printf_type print2_;					\
-		type value_ = val1_;					\
-		setup_block;						\
-		print1_ = print_;					\
-		value_ = val2_;						\
-		setup_block;						\
-		print2_ = print_;					\
-		TT_DECLARE(tt_status_?"	 OK":"FAIL",			\
-			   ("assert(%s): "printf_fmt" vs "printf_fmt,	\
-			    str_test, print1_, print2_));		\
-		print_ = print1_;					\
-		cleanup_block;						\
-		print_ = print2_;					\
-		cleanup_block;						\
-		if (!tt_status_) {					\
-			tinytest_set_test_failed_();			\
-			die_on_fail ;					\
-		}							\
-	}								\
-	TT_STMT_END
-
-#define tt_assert_test_type(a,b,str_test,type,test,fmt,die_on_fail)	\
-	tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt,	\
-	    {print_=value_;},{},die_on_fail)
-
-/* Helper: assert that a op b, when cast to type.  Format the values with
- * printf format fmt on failure. */
-#define tt_assert_op_type(a,op,b,type,fmt)				\
-	tt_assert_test_type(a,b,#a" "#op" "#b,type,(val1_ op val2_),fmt, \
-	    TT_EXIT_TEST_FUNCTION)
-
-#define tt_int_op(a,op,b)			\
-	tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_), \
-	    "%ld",TT_EXIT_TEST_FUNCTION)
-
-#define tt_uint_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long,		\
-	    (val1_ op val2_),"%lu",TT_EXIT_TEST_FUNCTION)
-
-#define tt_ptr_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,void*,			\
-	    (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION)
-
-#define tt_str_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,const char *,		\
-	    (strcmp(val1_,val2_) op 0),"<%s>",TT_EXIT_TEST_FUNCTION)
-
-#define tt_want_int_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0)
-
-#define tt_want_uint_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,unsigned long,		\
-	    (val1_ op val2_),"%lu",(void)0)
-
-#define tt_want_ptr_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,void*,			\
-	    (val1_ op val2_),"%p",(void)0)
-
-#define tt_want_str_op(a,op,b)						\
-	tt_assert_test_type(a,b,#a" "#op" "#b,const char *,		\
-	    (strcmp(val1_,val2_) op 0),"<%s>",(void)0)
-
-#endif