lib/: Use Salsa20/8 for random bits, rather than RC4.

[disorder] / libtests / Makefile.am

diff --git a/libtests/Makefile.am b/libtests/Makefile.am
index 7530f8b047321ea20d97994122866f41a5b5be3b..e6fdaa7a43d9c6a357947d3491c24ca5a394c557 100644 (file)
--- a/libtests/Makefile.am
+++ b/libtests/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2008 Richard Kettlewell
+# Copyright (C) 2008-2012 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
@@ -16,11 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-TESTS=t-addr t-arcfour t-basen t-bits t-cache t-casefold t-charset     \
+TESTS=t-addr 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 t-eventdist
+       t-words t-wstat t-macros t-cgi t-eventdist t-resample           \
+       t-configuration t-timeval t-salsa208
 
 noinst_PROGRAMS=$(TESTS)
 
@@ -28,7 +29,6 @@ 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
@@ -46,6 +46,7 @@ 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_printf_CFLAGS=$(AM_CFLAGS) -Wno-format-security
 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
@@ -54,22 +55,42 @@ 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_unicode_CFLAGS=$(AM_CFLAGS) -DSRCDIR=\"$(srcdir)\"
 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
 t_eventdist_SOURCES=t-eventdist.c test.c test.h
+t_resample_SOURCES=t-resample.c test.c test.h
+t_resample_LDADD=$(LDADD) $(LIBSAMPLERATE)
+t_configuration_SOURCES=t-configuration.c test.c test.h
+t_configuration_LDADD=$(LDADD) $(LIBGCRYPT)
+t_timeval_SOURCES=t-timeval.c test.c test.h
+t_salsa208_SOURCES=t-salsa208.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
+make-coverage-reports: check
+       cd ../lib && ${GCOV} *.c | ${PYTHON} ../scripts/format-gcov-report --html . *.c
 
-EXTRA_DIST=t-macros-1.tmpl t-macros-2
+UNICODE_TEST_FILES=GraphemeBreakTest NormalizationTest WordBreakTest
+UNICODE_TEST_BASE_URL=http://www.unicode.org/Public/6.0.0/ucd/
+GraphemeBreakTest_URL=$(UNICODE_TEST_BASE_URL)/auxiliary/GraphemeBreakTest.txt
+NormalizationTest_URL=$(UNICODE_TEST_BASE_URL)/NormalizationTest.txt
+WordBreakTest_URL=$(UNICODE_TEST_BASE_URL)/auxiliary/WordBreakTest.txt
+update-unicode-tests:
+       set -e; \
+       for t in $(foreach t,$(UNICODE_TEST_FILES),$t:$($t_URL)); do \
+         f=$${t%%:*} u=$${t#*:}; \
+         echo $$f $$u; \
+         rm -f $$f.new $$f.new.gz; wget -O$$f.new $$u; \
+         gzip -9cv $$f.new >$$f.new.gz; \
+         mv -f $$f.new.gz $(srcdir)/$$f.txt.gz; rm -f $$f.new; \
+       done
 
-CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html
+EXTRA_DIST=t-macros-1.tmpl t-macros-2 \
+       COPYING.unicode-tests $(addsuffix .txt.gz, $(UNICODE_TEST_FILES))
 
-DISTCLEANFILES=GraphemeBreakTest.txt NormalizationTest.txt     \
-              WordBreakTest.txt
+CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html