From 7affb40735592998dc047f216b48f9b771e4df1a Mon Sep 17 00:00:00 2001
Message-Id: <7affb40735592998dc047f216b48f9b771e4df1a.1714109730.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 25 May 2008 13:30:41 +0100
Subject: [PATCH] Move tests into their own directory.  Means you can 'make -C
 lib' without a huge wait for all the tests to relink.
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 .bzrignore                        |  71 +++++++--------
 configure.ac                      |  14 ++-
 lib/Makefile.am                   | 143 +-----------------------------
 libtests/Makefile.am              |  71 +++++++++++++++
 {lib => libtests}/t-addr.c        |   0
 {lib => libtests}/t-arcfour.c     |   0
 {lib => libtests}/t-basen.c       |   0
 {lib => libtests}/t-bits.c        |   0
 {lib => libtests}/t-cache.c       |   0
 {lib => libtests}/t-casefold.c    |   0
 {lib => libtests}/t-cgi.c         |   0
 {lib => libtests}/t-charset.c     |   0
 {lib => libtests}/t-cookies.c     |   0
 {lib => libtests}/t-dateparse.c   |   0
 {lib => libtests}/t-event.c       |   0
 {lib => libtests}/t-filepart.c    |   0
 {lib => libtests}/t-hash.c        |   0
 {lib => libtests}/t-heap.c        |   0
 {lib => libtests}/t-hex.c         |   0
 {lib => libtests}/t-kvp.c         |   0
 {lib => libtests}/t-macros-1.tmpl |   0
 {lib => libtests}/t-macros-2      |   0
 {lib => libtests}/t-macros.c      |   0
 {lib => libtests}/t-mime.c        |   0
 {lib => libtests}/t-printf.c      |   0
 {lib => libtests}/t-regsub.c      |   0
 {lib => libtests}/t-selection.c   |   0
 {lib => libtests}/t-signame.c     |   0
 {lib => libtests}/t-sink.c        |   0
 {lib => libtests}/t-split.c       |   0
 {lib => libtests}/t-syscalls.c    |   0
 {lib => libtests}/t-trackname.c   |   0
 {lib => libtests}/t-unicode.c     |   0
 {lib => libtests}/t-url.c         |   0
 {lib => libtests}/t-utf8.c        |   0
 {lib => libtests}/t-vector.c      |   0
 {lib => libtests}/t-words.c       |   0
 {lib => libtests}/t-wstat.c       |   0
 {lib => libtests}/test.c          |   0
 {lib => libtests}/test.h          |   0
 40 files changed, 120 insertions(+), 179 deletions(-)
 create mode 100644 libtests/Makefile.am
 rename {lib => libtests}/t-addr.c (100%)
 rename {lib => libtests}/t-arcfour.c (100%)
 rename {lib => libtests}/t-basen.c (100%)
 rename {lib => libtests}/t-bits.c (100%)
 rename {lib => libtests}/t-cache.c (100%)
 rename {lib => libtests}/t-casefold.c (100%)
 rename {lib => libtests}/t-cgi.c (100%)
 rename {lib => libtests}/t-charset.c (100%)
 rename {lib => libtests}/t-cookies.c (100%)
 rename {lib => libtests}/t-dateparse.c (100%)
 rename {lib => libtests}/t-event.c (100%)
 rename {lib => libtests}/t-filepart.c (100%)
 rename {lib => libtests}/t-hash.c (100%)
 rename {lib => libtests}/t-heap.c (100%)
 rename {lib => libtests}/t-hex.c (100%)
 rename {lib => libtests}/t-kvp.c (100%)
 rename {lib => libtests}/t-macros-1.tmpl (100%)
 rename {lib => libtests}/t-macros-2 (100%)
 rename {lib => libtests}/t-macros.c (100%)
 rename {lib => libtests}/t-mime.c (100%)
 rename {lib => libtests}/t-printf.c (100%)
 rename {lib => libtests}/t-regsub.c (100%)
 rename {lib => libtests}/t-selection.c (100%)
 rename {lib => libtests}/t-signame.c (100%)
 rename {lib => libtests}/t-sink.c (100%)
 rename {lib => libtests}/t-split.c (100%)
 rename {lib => libtests}/t-syscalls.c (100%)
 rename {lib => libtests}/t-trackname.c (100%)
 rename {lib => libtests}/t-unicode.c (100%)
 rename {lib => libtests}/t-url.c (100%)
 rename {lib => libtests}/t-utf8.c (100%)
 rename {lib => libtests}/t-vector.c (100%)
 rename {lib => libtests}/t-words.c (100%)
 rename {lib => libtests}/t-wstat.c (100%)
 rename {lib => libtests}/test.c (100%)
 rename {lib => libtests}/test.h (100%)

diff --git a/.bzrignore b/.bzrignore
index 6e03203..9a5ff0e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -115,14 +115,14 @@ server/disorder-stats
 *.deb
 *.dsc
 disobedience/disobedience.html
-lib/NormalizationTest.txt
+libtests/NormalizationTest.txt
 lib/CaseFolding.txt
 lib/UnicodeData.txt
 lib/GraphemeBreakProperty.txt
-lib/GraphemeBreakTest.txt
+libtests/GraphemeBreakTest.txt
 lib/WordBreakProperty.txt
 lib/SentenceBreakProperty.txt
-lib/WordBreakTest.txt
+libtests/WordBreakTest.txt
 lib/DerivedNormalizationProps.txt
 tests/*.log
 server/disorder-dbupgrade
@@ -146,34 +146,34 @@ scripts/teardown
 sounds/long.ogg
 sounds/slap.raw
 server/disorder-choose
-lib/t-addr
-lib/t-basen
-lib/t-bits
-lib/t-cache
-lib/t-casefold
-lib/t-cookies
-lib/t-filepart
-lib/t-hash
-lib/t-heap
-lib/t-hex
-lib/t-kvp
-lib/t-mime
-lib/t-printf
-lib/t-regsub
-lib/t-selection
-lib/t-signame
-lib/t-sink
-lib/t-split
-lib/t-syscalls
-lib/t-trackname
-lib/t-unicode
-lib/t-url
-lib/t-utf8
-lib/t-vector
-lib/t-words
-lib/t-wstat
-lib/t-macros
-lib/t-cgi
+libtests/t-addr
+libtests/t-basen
+libtests/t-bits
+libtests/t-cache
+libtests/t-casefold
+libtests/t-cookies
+libtests/t-filepart
+libtests/t-hash
+libtests/t-heap
+libtests/t-hex
+libtests/t-kvp
+libtests/t-mime
+libtests/t-printf
+libtests/t-regsub
+libtests/t-selection
+libtests/t-signame
+libtests/t-sink
+libtests/t-split
+libtests/t-syscalls
+libtests/t-trackname
+libtests/t-unicode
+libtests/t-url
+libtests/t-utf8
+libtests/t-vector
+libtests/t-words
+libtests/t-wstat
+libtests/t-macros
+libtests/t-cgi
 doc/*.tmpl
 doc/disorder_templates.5
 oc/disorder_templates.5.html
@@ -187,7 +187,8 @@ doc/disorder_options.5
 doc/disorder_options.5.html
 doc/disorder_actions.5.in
 doc/disorder_templates.5.in
-lib/t-arcfour
-lib/t-charset
-lib/t-event
-lib/t-dateparse
+libtests/t-arcfour
+libtests/t-charset
+libtests/t-event
+libtests/t-dateparse
+libtests/Makefile
diff --git a/configure.ac b/configure.ac
index bfed8b5..beb2803 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_CANONICAL_HOST
 # What we want to build
 want_gtk=yes
 want_python=yes
+want_tests=yes
 
 # APIs we want
 want_alsa=yes
@@ -60,6 +61,10 @@ AC_ARG_WITH([coreaudio],
 	    [AS_HELP_STRING([--without-coreaudio],
 			    [do not build with Core Audio support])],
 	    [want_coreaudio=$withval])
+AC_ARG_WITH([tests],
+	    [AS_HELP_STRING([--without-tests],
+			    [do not build test suit])],
+	    [want_tests=$withval])
 
 AC_MSG_CHECKING([for a known target platform])
 case "$host" in
@@ -166,7 +171,11 @@ AC_ARG_WITH([python],
 			    [do not build Python support])],
 	    [want_python=$withval])
 
-subdirs="scripts lib clients doc examples debian"
+subdirs="scripts lib"
+if test $want_tests = yes; then
+  subdirs="${subdirs} libtests"
+fi
+subdirs="${subdirs} clients doc examples debian"
 
 if test $want_server = yes; then
   subdirs="${subdirs} server plugins driver templates sounds images"
@@ -177,7 +186,7 @@ if test $want_gtk = yes; then
     subdirs="${subdirs} images"
   fi
 fi
-if test $want_python = yes; then
+if test $want_tests = yes && test $want_python = yes; then
   AM_PATH_PYTHON([2.4])
   subdirs="${subdirs} python tests"
 fi
@@ -590,6 +599,7 @@ AC_CONFIG_FILES([Makefile
 		 sounds/Makefile
 		 python/Makefile
 		 examples/Makefile
+		 libtests/Makefile
 		 tests/Makefile])
 AC_OUTPUT
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 16cdcea..27ecb2c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,15 +18,8 @@
 # USA
 #
 
-TESTS=t-addr t-arcfour t-basen t-bits t-cache t-casefold t-charset	\
-	t-cookies t-dateparse t-event t-filepart t-hash t-heap t-hex	\
-	t-kvp t-mime t-printf t-regsub t-selection t-signame t-sink	\
-	t-split t-syscalls t-trackname t-unicode t-url t-utf8 t-vector	\
-	t-words t-wstat t-macros t-cgi
-
 noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
-noinst_PROGRAMS=$(TESTS)
 
 if SERVER
 TRACKDB=trackdb.c
@@ -126,140 +119,6 @@ definitions.h: Makefile
 defs.o: definitions.h versionstring.h
 defs.lo: definitions.h versionstring.h
 
-t_addr_SOURCES=t-addr.c test.c test.h
-t_addr_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_addr_DEPENDENCIES=libdisorder.a
-
-t_arcfour_SOURCES=t-arcfour.c test.c test.h
-t_arcfour_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_arcfour_DEPENDENCIES=libdisorder.a
-
-t_basen_SOURCES=t-basen.c test.c test.h
-t_basen_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_basen_DEPENDENCIES=libdisorder.a
-
-t_bits_SOURCES=t-bits.c test.c test.h
-t_bits_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_bits_DEPENDENCIES=libdisorder.a
-
-t_cache_SOURCES=t-cache.c test.c test.h
-t_cache_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_cache_DEPENDENCIES=libdisorder.a
-
-t_casefold_SOURCES=t-casefold.c test.c test.h
-t_casefold_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_casefold_DEPENDENCIES=libdisorder.a
-
-t_charset_SOURCES=t-charset.c test.c test.h
-t_charset_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_charset_DEPENDENCIES=libdisorder.a
-
-t_cgi_SOURCES=t-cgi.c test.c test.h
-t_cgi_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_cgi_DEPENDENCIES=libdisorder.a
-
-t_cookies_SOURCES=t-cookies.c test.c test.h
-t_cookies_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_cookies_DEPENDENCIES=libdisorder.a
-
-t_dateparse_SOURCES=t-dateparse.c test.c test.h
-t_dateparse_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_dateparse_DEPENDENCIES=libdisorder.a
-
-t_event_SOURCES=t-event.c test.c test.h
-t_event_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_event_DEPENDENCIES=libdisorder.a
-
-t_filepart_SOURCES=t-filepart.c test.c test.h
-t_filepart_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_filepart_DEPENDENCIES=libdisorder.a
-
-t_hash_SOURCES=t-hash.c test.c test.h
-t_hash_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_hash_DEPENDENCIES=libdisorder.a
-
-t_heap_SOURCES=t-heap.c test.c test.h
-t_heap_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_heap_DEPENDENCIES=libdisorder.a
-
-t_hex_SOURCES=t-hex.c test.c test.h
-t_hex_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_hex_DEPENDENCIES=libdisorder.a
-
-t_kvp_SOURCES=t-kvp.c test.c test.h
-t_kvp_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_kvp_DEPENDENCIES=libdisorder.a
-
-t_macros_SOURCES=t-macros.c test.c test.h
-t_macros_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_macros_DEPENDENCIES=libdisorder.a
-
-t_mime_SOURCES=t-mime.c test.c test.h
-t_mime_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_mime_DEPENDENCIES=libdisorder.a
-
-t_printf_SOURCES=t-printf.c test.c test.h
-t_printf_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_printf_DEPENDENCIES=libdisorder.a
-
-t_regsub_SOURCES=t-regsub.c test.c test.h
-t_regsub_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_regsub_DEPENDENCIES=libdisorder.a
-
-t_selection_SOURCES=t-selection.c test.c test.h
-t_selection_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_selection_DEPENDENCIES=libdisorder.a
-
-t_signame_SOURCES=t-signame.c test.c test.h
-t_signame_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_signame_DEPENDENCIES=libdisorder.a
-
-t_sink_SOURCES=t-sink.c test.c test.h
-t_sink_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_sink_DEPENDENCIES=libdisorder.a
-
-t_split_SOURCES=t-split.c test.c test.h
-t_split_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_split_DEPENDENCIES=libdisorder.a
-
-t_syscalls_SOURCES=t-syscalls.c test.c test.h
-t_syscalls_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_syscalls_DEPENDENCIES=libdisorder.a
-
-t_trackname_SOURCES=t-trackname.c test.c test.h
-t_trackname_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_trackname_DEPENDENCIES=libdisorder.a
-
-t_unicode_SOURCES=t-unicode.c test.c test.h
-t_unicode_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_unicode_DEPENDENCIES=libdisorder.a
-
-t_url_SOURCES=t-url.c test.c test.h
-t_url_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_url_DEPENDENCIES=libdisorder.a
-
-t_utf8_SOURCES=t-utf8.c test.c test.h
-t_utf8_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_utf8_DEPENDENCIES=libdisorder.a
-
-t_vector_SOURCES=t-vector.c test.c test.h
-t_vector_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_vector_DEPENDENCIES=libdisorder.a
-
-t_words_SOURCES=t-words.c test.c test.h
-t_words_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_words_DEPENDENCIES=libdisorder.a
-
-t_wstat_SOURCES=t-wstat.c test.c test.h
-t_wstat_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
-t_wstat_DEPENDENCIES=libdisorder.a
-
-check-report: before-check check make-coverage-reports
-before-check:
-	rm -f *.gcda *.gcov
-make-coverage-reports:
-	${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
-
 rebuild-unicode:
 	cd ${srcdir} && ${top_srcdir}/scripts/make-unidata
 
@@ -269,4 +128,4 @@ rebuild-unicode:
 
 CLEANFILES=definitions.h definitions.h.new
 
-EXTRA_DIST=trackdb.c trackdb-stub.c t-macros-1.tmpl t-macros-2
+EXTRA_DIST=trackdb.c trackdb-stub.c
diff --git a/libtests/Makefile.am b/libtests/Makefile.am
new file mode 100644
index 0000000..8a70152
--- /dev/null
+++ b/libtests/Makefile.am
@@ -0,0 +1,71 @@
+#
+# This file is part of DisOrder.
+# Copyright (C) 2008 Richard Kettlewell
+#
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+
+TESTS=t-addr t-arcfour t-basen t-bits t-cache t-casefold t-charset	\
+	t-cookies t-dateparse t-event t-filepart t-hash t-heap t-hex	\
+	t-kvp t-mime t-printf t-regsub t-selection t-signame t-sink	\
+	t-split t-syscalls t-trackname t-unicode t-url t-utf8 t-vector	\
+	t-words t-wstat t-macros t-cgi
+
+noinst_PROGRAMS=$(TESTS)
+
+AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
+LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)
+
+t_addr_SOURCES=t-addr.c test.c test.h
+t_arcfour_SOURCES=t-arcfour.c test.c test.h
+t_basen_SOURCES=t-basen.c test.c test.h
+t_bits_SOURCES=t-bits.c test.c test.h
+t_cache_SOURCES=t-cache.c test.c test.h
+t_casefold_SOURCES=t-casefold.c test.c test.h
+t_charset_SOURCES=t-charset.c test.c test.h
+t_cgi_SOURCES=t-cgi.c test.c test.h
+t_cookies_SOURCES=t-cookies.c test.c test.h
+t_dateparse_SOURCES=t-dateparse.c test.c test.h
+t_event_SOURCES=t-event.c test.c test.h
+t_filepart_SOURCES=t-filepart.c test.c test.h
+t_hash_SOURCES=t-hash.c test.c test.h
+t_heap_SOURCES=t-heap.c test.c test.h
+t_hex_SOURCES=t-hex.c test.c test.h
+t_kvp_SOURCES=t-kvp.c test.c test.h
+t_macros_SOURCES=t-macros.c test.c test.h
+t_mime_SOURCES=t-mime.c test.c test.h
+t_printf_SOURCES=t-printf.c test.c test.h
+t_regsub_SOURCES=t-regsub.c test.c test.h
+t_selection_SOURCES=t-selection.c test.c test.h
+t_signame_SOURCES=t-signame.c test.c test.h
+t_sink_SOURCES=t-sink.c test.c test.h
+t_split_SOURCES=t-split.c test.c test.h
+t_syscalls_SOURCES=t-syscalls.c test.c test.h
+t_trackname_SOURCES=t-trackname.c test.c test.h
+t_unicode_SOURCES=t-unicode.c test.c test.h
+t_url_SOURCES=t-url.c test.c test.h
+t_utf8_SOURCES=t-utf8.c test.c test.h
+t_vector_SOURCES=t-vector.c test.c test.h
+t_words_SOURCES=t-words.c test.c test.h
+t_wstat_SOURCES=t-wstat.c test.c test.h
+
+check-report: before-check check make-coverage-reports
+before-check:
+	rm -f *.gcda *.gcov
+make-coverage-reports:
+	${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
+
+EXTRA_DIST=t-macros-1.tmpl t-macros-2
diff --git a/lib/t-addr.c b/libtests/t-addr.c
similarity index 100%
rename from lib/t-addr.c
rename to libtests/t-addr.c
diff --git a/lib/t-arcfour.c b/libtests/t-arcfour.c
similarity index 100%
rename from lib/t-arcfour.c
rename to libtests/t-arcfour.c
diff --git a/lib/t-basen.c b/libtests/t-basen.c
similarity index 100%
rename from lib/t-basen.c
rename to libtests/t-basen.c
diff --git a/lib/t-bits.c b/libtests/t-bits.c
similarity index 100%
rename from lib/t-bits.c
rename to libtests/t-bits.c
diff --git a/lib/t-cache.c b/libtests/t-cache.c
similarity index 100%
rename from lib/t-cache.c
rename to libtests/t-cache.c
diff --git a/lib/t-casefold.c b/libtests/t-casefold.c
similarity index 100%
rename from lib/t-casefold.c
rename to libtests/t-casefold.c
diff --git a/lib/t-cgi.c b/libtests/t-cgi.c
similarity index 100%
rename from lib/t-cgi.c
rename to libtests/t-cgi.c
diff --git a/lib/t-charset.c b/libtests/t-charset.c
similarity index 100%
rename from lib/t-charset.c
rename to libtests/t-charset.c
diff --git a/lib/t-cookies.c b/libtests/t-cookies.c
similarity index 100%
rename from lib/t-cookies.c
rename to libtests/t-cookies.c
diff --git a/lib/t-dateparse.c b/libtests/t-dateparse.c
similarity index 100%
rename from lib/t-dateparse.c
rename to libtests/t-dateparse.c
diff --git a/lib/t-event.c b/libtests/t-event.c
similarity index 100%
rename from lib/t-event.c
rename to libtests/t-event.c
diff --git a/lib/t-filepart.c b/libtests/t-filepart.c
similarity index 100%
rename from lib/t-filepart.c
rename to libtests/t-filepart.c
diff --git a/lib/t-hash.c b/libtests/t-hash.c
similarity index 100%
rename from lib/t-hash.c
rename to libtests/t-hash.c
diff --git a/lib/t-heap.c b/libtests/t-heap.c
similarity index 100%
rename from lib/t-heap.c
rename to libtests/t-heap.c
diff --git a/lib/t-hex.c b/libtests/t-hex.c
similarity index 100%
rename from lib/t-hex.c
rename to libtests/t-hex.c
diff --git a/lib/t-kvp.c b/libtests/t-kvp.c
similarity index 100%
rename from lib/t-kvp.c
rename to libtests/t-kvp.c
diff --git a/lib/t-macros-1.tmpl b/libtests/t-macros-1.tmpl
similarity index 100%
rename from lib/t-macros-1.tmpl
rename to libtests/t-macros-1.tmpl
diff --git a/lib/t-macros-2 b/libtests/t-macros-2
similarity index 100%
rename from lib/t-macros-2
rename to libtests/t-macros-2
diff --git a/lib/t-macros.c b/libtests/t-macros.c
similarity index 100%
rename from lib/t-macros.c
rename to libtests/t-macros.c
diff --git a/lib/t-mime.c b/libtests/t-mime.c
similarity index 100%
rename from lib/t-mime.c
rename to libtests/t-mime.c
diff --git a/lib/t-printf.c b/libtests/t-printf.c
similarity index 100%
rename from lib/t-printf.c
rename to libtests/t-printf.c
diff --git a/lib/t-regsub.c b/libtests/t-regsub.c
similarity index 100%
rename from lib/t-regsub.c
rename to libtests/t-regsub.c
diff --git a/lib/t-selection.c b/libtests/t-selection.c
similarity index 100%
rename from lib/t-selection.c
rename to libtests/t-selection.c
diff --git a/lib/t-signame.c b/libtests/t-signame.c
similarity index 100%
rename from lib/t-signame.c
rename to libtests/t-signame.c
diff --git a/lib/t-sink.c b/libtests/t-sink.c
similarity index 100%
rename from lib/t-sink.c
rename to libtests/t-sink.c
diff --git a/lib/t-split.c b/libtests/t-split.c
similarity index 100%
rename from lib/t-split.c
rename to libtests/t-split.c
diff --git a/lib/t-syscalls.c b/libtests/t-syscalls.c
similarity index 100%
rename from lib/t-syscalls.c
rename to libtests/t-syscalls.c
diff --git a/lib/t-trackname.c b/libtests/t-trackname.c
similarity index 100%
rename from lib/t-trackname.c
rename to libtests/t-trackname.c
diff --git a/lib/t-unicode.c b/libtests/t-unicode.c
similarity index 100%
rename from lib/t-unicode.c
rename to libtests/t-unicode.c
diff --git a/lib/t-url.c b/libtests/t-url.c
similarity index 100%
rename from lib/t-url.c
rename to libtests/t-url.c
diff --git a/lib/t-utf8.c b/libtests/t-utf8.c
similarity index 100%
rename from lib/t-utf8.c
rename to libtests/t-utf8.c
diff --git a/lib/t-vector.c b/libtests/t-vector.c
similarity index 100%
rename from lib/t-vector.c
rename to libtests/t-vector.c
diff --git a/lib/t-words.c b/libtests/t-words.c
similarity index 100%
rename from lib/t-words.c
rename to libtests/t-words.c
diff --git a/lib/t-wstat.c b/libtests/t-wstat.c
similarity index 100%
rename from lib/t-wstat.c
rename to libtests/t-wstat.c
diff --git a/lib/test.c b/libtests/test.c
similarity index 100%
rename from lib/test.c
rename to libtests/test.c
diff --git a/lib/test.h b/libtests/test.h
similarity index 100%
rename from lib/test.h
rename to libtests/test.h
-- 
[mdw]