From 5c946f9c61cd9e5379fa9edf9fc613927dfa432d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 9 Feb 2013 04:21:32 +0800 Subject: [PATCH] Move tests to test/default and windows to quirks/windows. test/default contains only tests using the default primitives for a given operation. We need to add other tests as well. --- .gitignore | 70 ++++---- configure.ac | 3 +- test/Makefile.am | 185 +-------------------- test/default/Makefile.am | 184 ++++++++++++++++++++ test/{ => default}/auth.c | 0 test/{ => default}/auth.exp | 0 test/{ => default}/auth2.c | 0 test/{ => default}/auth2.exp | 0 test/{ => default}/auth3.c | 0 test/{ => default}/auth3.exp | 0 test/{ => default}/auth5.c | 0 test/{ => default}/auth5.exp | 0 test/{ => default}/box.c | 0 test/{ => default}/box.exp | 0 test/{ => default}/box2.c | 0 test/{ => default}/box2.exp | 0 test/{ => default}/box7.c | 0 test/{ => default}/box7.exp | 0 test/{ => default}/box8.c | 0 test/{ => default}/box8.exp | 0 test/{ => default}/cmptest.h | 0 test/{ => default}/core1.c | 0 test/{ => default}/core1.exp | 0 test/{ => default}/core2.c | 0 test/{ => default}/core2.exp | 0 test/{ => default}/core3.c | 0 test/{ => default}/core3.exp | 0 test/{ => default}/core4.c | 0 test/{ => default}/core4.exp | 0 test/{ => default}/core5.c | 0 test/{ => default}/core5.exp | 0 test/{ => default}/core6.c | 0 test/{ => default}/core6.exp | 0 test/{ => default}/hash.c | 0 test/{ => default}/hash.exp | 0 test/{ => default}/hash2.exp | 0 test/{ => default}/hash3.c | 0 test/{ => default}/hash3.exp | 0 test/{ => default}/onetimeauth.c | 0 test/{ => default}/onetimeauth.exp | 0 test/{ => default}/onetimeauth2.c | 0 test/{ => default}/onetimeauth2.exp | 0 test/{ => default}/onetimeauth7.c | 0 test/{ => default}/onetimeauth7.exp | 0 test/{ => default}/randombytes.c | 0 test/{ => default}/scalarmult.c | 0 test/{ => default}/scalarmult.exp | 0 test/{ => default}/scalarmult2.c | 0 test/{ => default}/scalarmult2.exp | 0 test/{ => default}/scalarmult5.c | 0 test/{ => default}/scalarmult5.exp | 0 test/{ => default}/scalarmult6.c | 0 test/{ => default}/scalarmult6.exp | 0 test/{ => default}/secretbox.c | 0 test/{ => default}/secretbox.exp | 0 test/{ => default}/secretbox2.c | 0 test/{ => default}/secretbox2.exp | 0 test/{ => default}/secretbox7.c | 0 test/{ => default}/secretbox7.exp | 0 test/{ => default}/secretbox8.c | 0 test/{ => default}/secretbox8.exp | 0 test/{ => default}/shorthash.c | 0 test/{ => default}/shorthash.exp | 0 test/{ => default}/stream.c | 0 test/{ => default}/stream.exp | 0 test/{ => default}/stream2.c | 0 test/{ => default}/stream2.exp | 0 test/{ => default}/stream3.c | 0 test/{ => default}/stream3.exp | 0 test/{ => default}/stream4.c | 0 test/{ => default}/stream4.exp | 0 test/{ => quirks}/windows/windows-quirks.h | 0 72 files changed, 224 insertions(+), 218 deletions(-) create mode 100644 test/default/Makefile.am rename test/{ => default}/auth.c (100%) rename test/{ => default}/auth.exp (100%) rename test/{ => default}/auth2.c (100%) rename test/{ => default}/auth2.exp (100%) rename test/{ => default}/auth3.c (100%) rename test/{ => default}/auth3.exp (100%) rename test/{ => default}/auth5.c (100%) rename test/{ => default}/auth5.exp (100%) rename test/{ => default}/box.c (100%) rename test/{ => default}/box.exp (100%) rename test/{ => default}/box2.c (100%) rename test/{ => default}/box2.exp (100%) rename test/{ => default}/box7.c (100%) rename test/{ => default}/box7.exp (100%) rename test/{ => default}/box8.c (100%) rename test/{ => default}/box8.exp (100%) rename test/{ => default}/cmptest.h (100%) rename test/{ => default}/core1.c (100%) rename test/{ => default}/core1.exp (100%) rename test/{ => default}/core2.c (100%) rename test/{ => default}/core2.exp (100%) rename test/{ => default}/core3.c (100%) rename test/{ => default}/core3.exp (100%) rename test/{ => default}/core4.c (100%) rename test/{ => default}/core4.exp (100%) rename test/{ => default}/core5.c (100%) rename test/{ => default}/core5.exp (100%) rename test/{ => default}/core6.c (100%) rename test/{ => default}/core6.exp (100%) rename test/{ => default}/hash.c (100%) rename test/{ => default}/hash.exp (100%) rename test/{ => default}/hash2.exp (100%) rename test/{ => default}/hash3.c (100%) rename test/{ => default}/hash3.exp (100%) rename test/{ => default}/onetimeauth.c (100%) rename test/{ => default}/onetimeauth.exp (100%) rename test/{ => default}/onetimeauth2.c (100%) rename test/{ => default}/onetimeauth2.exp (100%) rename test/{ => default}/onetimeauth7.c (100%) rename test/{ => default}/onetimeauth7.exp (100%) rename test/{ => default}/randombytes.c (100%) rename test/{ => default}/scalarmult.c (100%) rename test/{ => default}/scalarmult.exp (100%) rename test/{ => default}/scalarmult2.c (100%) rename test/{ => default}/scalarmult2.exp (100%) rename test/{ => default}/scalarmult5.c (100%) rename test/{ => default}/scalarmult5.exp (100%) rename test/{ => default}/scalarmult6.c (100%) rename test/{ => default}/scalarmult6.exp (100%) rename test/{ => default}/secretbox.c (100%) rename test/{ => default}/secretbox.exp (100%) rename test/{ => default}/secretbox2.c (100%) rename test/{ => default}/secretbox2.exp (100%) rename test/{ => default}/secretbox7.c (100%) rename test/{ => default}/secretbox7.exp (100%) rename test/{ => default}/secretbox8.c (100%) rename test/{ => default}/secretbox8.exp (100%) rename test/{ => default}/shorthash.c (100%) rename test/{ => default}/shorthash.exp (100%) rename test/{ => default}/stream.c (100%) rename test/{ => default}/stream.exp (100%) rename test/{ => default}/stream2.c (100%) rename test/{ => default}/stream2.exp (100%) rename test/{ => default}/stream3.c (100%) rename test/{ => default}/stream3.exp (100%) rename test/{ => default}/stream4.c (100%) rename test/{ => default}/stream4.exp (100%) rename test/{ => quirks}/windows/windows-quirks.h (100%) diff --git a/.gitignore b/.gitignore index c8e50864..3d52af52 100644 --- a/.gitignore +++ b/.gitignore @@ -41,38 +41,38 @@ missing src/libsodium/include/sodium/version.h stamp-* testing -test/*.res -test/*.trs -test/auth -test/auth2 -test/auth3 -test/auth5 -test/box -test/box2 -test/box7 -test/box8 -test/core1 -test/core2 -test/core3 -test/core4 -test/core5 -test/core6 -test/hash -test/hash3 -test/onetimeauth -test/onetimeauth2 -test/onetimeauth7 -test/randombytes -test/scalarmult -test/scalarmult2 -test/scalarmult5 -test/scalarmult6 -test/secretbox -test/secretbox2 -test/secretbox7 -test/secretbox8 -test/shorthash -test/stream -test/stream2 -test/stream3 -test/stream4 +test/default/*.res +test/default/*.trs +test/default/auth +test/default/auth2 +test/default/auth3 +test/default/auth5 +test/default/box +test/default/box2 +test/default/box7 +test/default/box8 +test/default/core1 +test/default/core2 +test/default/core3 +test/default/core4 +test/default/core5 +test/default/core6 +test/default/hash +test/default/hash3 +test/default/onetimeauth +test/default/onetimeauth2 +test/default/onetimeauth7 +test/default/randombytes +test/default/scalarmult +test/default/scalarmult2 +test/default/scalarmult5 +test/default/scalarmult6 +test/default/secretbox +test/default/secretbox2 +test/default/secretbox7 +test/default/secretbox8 +test/default/shorthash +test/default/stream +test/default/stream2 +test/default/stream3 +test/default/stream4 diff --git a/configure.ac b/configure.ac index 51b1744d..932c24ec 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_SUBST(VERSION) ISODATE=`date +%Y-%m-%d` AC_SUBST(ISODATE) -SODIUM_LIBRARY_VERSION=1:1:1 +SODIUM_LIBRARY_VERSION=2:0:2 # | | | # +------+ | +---+ # | | | @@ -229,6 +229,7 @@ AC_CONFIG_FILES([Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h + test/default/Makefile test/Makefile ]) AC_OUTPUT diff --git a/test/Makefile.am b/test/Makefile.am index 45f70ce0..346d2692 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,184 +1,5 @@ +SUBDIRS = \ + default EXTRA_DIST = \ - cmptest.h \ - windows/windows-quirks.h \ - auth.exp \ - auth2.exp \ - auth3.exp \ - auth5.exp \ - box.exp \ - box2.exp \ - box7.exp \ - box8.exp \ - core1.exp \ - core2.exp \ - core3.exp \ - core4.exp \ - core5.exp \ - core6.exp \ - hash.exp \ - hash2.exp \ - hash3.exp \ - onetimeauth.exp \ - onetimeauth2.exp \ - onetimeauth7.exp \ - scalarmult.exp \ - scalarmult2.exp \ - scalarmult5.exp \ - scalarmult6.exp \ - secretbox.exp \ - secretbox2.exp \ - secretbox7.exp \ - secretbox8.exp \ - shorthash.exp \ - stream.exp \ - stream2.exp \ - stream3.exp \ - stream4.exp - -AM_CPPFLAGS = \ - -I$(top_srcdir)/src/libsodium/include \ - -I$(top_srcdir)/src/libsodium/include/sodium - -TESTS_TARGETS = \ - auth \ - auth2 \ - auth3 \ - auth5 \ - box \ - box2 \ - box7 \ - box8 \ - core1 \ - core2 \ - core3 \ - core4 \ - core5 \ - core6 \ - hash \ - hash3 \ - onetimeauth \ - onetimeauth2 \ - onetimeauth7 \ - randombytes \ - scalarmult \ - scalarmult2 \ - scalarmult5 \ - scalarmult6 \ - secretbox \ - secretbox2 \ - secretbox7 \ - secretbox8 \ - shorthash \ - stream \ - stream2 \ - stream3 \ - stream4 - -check_PROGRAMS = $(TESTS_TARGETS) - -TESTS = $(TESTS_TARGETS) - -TESTS_LDADD = \ - ${top_builddir}/src/libsodium/libsodium.la - -auth_SOURCE = cmptest.h auth.c -auth_LDADD = $(TESTS_LDADD) - -auth2_SOURCE = cmptest.h auth2.c -auth2_LDADD = $(TESTS_LDADD) - -auth3_SOURCE = cmptest.h auth3.c -auth3_LDADD = $(TESTS_LDADD) - -auth5_SOURCE = cmptest.h auth5.c windows/windows-quirks.h -auth5_LDADD = $(TESTS_LDADD) - -box_SOURCE = cmptest.h box.c -box_LDADD = $(TESTS_LDADD) - -box2_SOURCE = cmptest.h box2.c -box2_LDADD = $(TESTS_LDADD) - -box7_SOURCE = cmptest.h box7.c -box7_LDADD = $(TESTS_LDADD) - -box8_SOURCE = cmptest.h box8.c -box8_LDADD = $(TESTS_LDADD) - -core1_SOURCE = cmptest.h core1.c -core1_LDADD = $(TESTS_LDADD) - -core2_SOURCE = cmptest.h core2.c -core2_LDADD = $(TESTS_LDADD) - -core3_SOURCE = cmptest.h core3.c -core3_LDADD = $(TESTS_LDADD) - -core4_SOURCE = cmptest.h core4.c -core4_LDADD = $(TESTS_LDADD) - -core5_SOURCE = cmptest.h core5.c -core5_LDADD = $(TESTS_LDADD) - -core6_SOURCE = cmptest.h core6.c -core6_LDADD = $(TESTS_LDADD) - -hash_SOURCE = cmptest.h hash.c -hash_LDADD = $(TESTS_LDADD) - -hash3_SOURCE = cmptest.h hash3.c -hash3_LDADD = $(TESTS_LDADD) - -onetimeauth_SOURCE = cmptest.h onetimeauth.c -onetimeauth_LDADD = $(TESTS_LDADD) - -onetimeauth2_SOURCE = cmptest.h onetimeauth2.c -onetimeauth2_LDADD = $(TESTS_LDADD) - -onetimeauth7_SOURCE = cmptest.h onetimeauth7.c -onetimeauth7_LDADD = $(TESTS_LDADD) - -randombytes_SOURCE = randombytes.c -randombytes_LDADD = $(TESTS_LDADD) - -scalarmult_SOURCE = cmptest.h scalarmult.c -scalarmult_LDADD = $(TESTS_LDADD) - -scalarmult2_SOURCE = cmptest.h scalarmult2.c -scalarmult2_LDADD = $(TESTS_LDADD) - -scalarmult5_SOURCE = cmptest.h scalarmult5.c -scalarmult5_LDADD = $(TESTS_LDADD) - -scalarmult6_SOURCE = cmptest.h scalarmult6.c -scalarmult6_LDADD = $(TESTS_LDADD) - -secretbox_SOURCE = cmptest.h secretbox.c -secretbox_LDADD = $(TESTS_LDADD) - -secretbox2_SOURCE = cmptest.h secretbox2.c -secretbox2_LDADD = $(TESTS_LDADD) - -secretbox7_SOURCE = cmptest.h secretbox7.c -secretbox7_LDADD = $(TESTS_LDADD) - -secretbox8_SOURCE = cmptest.h secretbox8.c -secretbox8_LDADD = $(TESTS_LDADD) - -shorthash_SOURCE = cmptest.h shorthash.c -shorthash_LDADD = $(TESTS_LDADD) - -stream_SOURCE = cmptest.h stream.c -stream_LDADD = $(TESTS_LDADD) - -stream2_SOURCE = cmptest.h stream2.c -stream2_LDADD = $(TESTS_LDADD) - -stream3_SOURCE = cmptest.h stream3.c -stream3_LDADD = $(TESTS_LDADD) - -stream4_SOURCE = cmptest.h stream4.c -stream4_LDADD = $(TESTS_LDADD) - -verify: check + quirks/windows/windows-quirks.h diff --git a/test/default/Makefile.am b/test/default/Makefile.am new file mode 100644 index 00000000..630fe372 --- /dev/null +++ b/test/default/Makefile.am @@ -0,0 +1,184 @@ + +EXTRA_DIST = \ + cmptest.h \ + auth.exp \ + auth2.exp \ + auth3.exp \ + auth5.exp \ + box.exp \ + box2.exp \ + box7.exp \ + box8.exp \ + core1.exp \ + core2.exp \ + core3.exp \ + core4.exp \ + core5.exp \ + core6.exp \ + hash.exp \ + hash2.exp \ + hash3.exp \ + onetimeauth.exp \ + onetimeauth2.exp \ + onetimeauth7.exp \ + scalarmult.exp \ + scalarmult2.exp \ + scalarmult5.exp \ + scalarmult6.exp \ + secretbox.exp \ + secretbox2.exp \ + secretbox7.exp \ + secretbox8.exp \ + shorthash.exp \ + stream.exp \ + stream2.exp \ + stream3.exp \ + stream4.exp + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libsodium/include \ + -I$(top_srcdir)/src/libsodium/include/sodium \ + -I$(top_srcdir)/test/quirks + +TESTS_TARGETS = \ + auth \ + auth2 \ + auth3 \ + auth5 \ + box \ + box2 \ + box7 \ + box8 \ + core1 \ + core2 \ + core3 \ + core4 \ + core5 \ + core6 \ + hash \ + hash3 \ + onetimeauth \ + onetimeauth2 \ + onetimeauth7 \ + randombytes \ + scalarmult \ + scalarmult2 \ + scalarmult5 \ + scalarmult6 \ + secretbox \ + secretbox2 \ + secretbox7 \ + secretbox8 \ + shorthash \ + stream \ + stream2 \ + stream3 \ + stream4 + +check_PROGRAMS = $(TESTS_TARGETS) + +TESTS = $(TESTS_TARGETS) + +TESTS_LDADD = \ + ${top_builddir}/src/libsodium/libsodium.la + +auth_SOURCE = cmptest.h auth.c +auth_LDADD = $(TESTS_LDADD) + +auth2_SOURCE = cmptest.h auth2.c +auth2_LDADD = $(TESTS_LDADD) + +auth3_SOURCE = cmptest.h auth3.c +auth3_LDADD = $(TESTS_LDADD) + +auth5_SOURCE = cmptest.h auth5.c windows/windows-quirks.h +auth5_LDADD = $(TESTS_LDADD) + +box_SOURCE = cmptest.h box.c +box_LDADD = $(TESTS_LDADD) + +box2_SOURCE = cmptest.h box2.c +box2_LDADD = $(TESTS_LDADD) + +box7_SOURCE = cmptest.h box7.c +box7_LDADD = $(TESTS_LDADD) + +box8_SOURCE = cmptest.h box8.c +box8_LDADD = $(TESTS_LDADD) + +core1_SOURCE = cmptest.h core1.c +core1_LDADD = $(TESTS_LDADD) + +core2_SOURCE = cmptest.h core2.c +core2_LDADD = $(TESTS_LDADD) + +core3_SOURCE = cmptest.h core3.c +core3_LDADD = $(TESTS_LDADD) + +core4_SOURCE = cmptest.h core4.c +core4_LDADD = $(TESTS_LDADD) + +core5_SOURCE = cmptest.h core5.c +core5_LDADD = $(TESTS_LDADD) + +core6_SOURCE = cmptest.h core6.c +core6_LDADD = $(TESTS_LDADD) + +hash_SOURCE = cmptest.h hash.c +hash_LDADD = $(TESTS_LDADD) + +hash3_SOURCE = cmptest.h hash3.c +hash3_LDADD = $(TESTS_LDADD) + +onetimeauth_SOURCE = cmptest.h onetimeauth.c +onetimeauth_LDADD = $(TESTS_LDADD) + +onetimeauth2_SOURCE = cmptest.h onetimeauth2.c +onetimeauth2_LDADD = $(TESTS_LDADD) + +onetimeauth7_SOURCE = cmptest.h onetimeauth7.c +onetimeauth7_LDADD = $(TESTS_LDADD) + +randombytes_SOURCE = randombytes.c +randombytes_LDADD = $(TESTS_LDADD) + +scalarmult_SOURCE = cmptest.h scalarmult.c +scalarmult_LDADD = $(TESTS_LDADD) + +scalarmult2_SOURCE = cmptest.h scalarmult2.c +scalarmult2_LDADD = $(TESTS_LDADD) + +scalarmult5_SOURCE = cmptest.h scalarmult5.c +scalarmult5_LDADD = $(TESTS_LDADD) + +scalarmult6_SOURCE = cmptest.h scalarmult6.c +scalarmult6_LDADD = $(TESTS_LDADD) + +secretbox_SOURCE = cmptest.h secretbox.c +secretbox_LDADD = $(TESTS_LDADD) + +secretbox2_SOURCE = cmptest.h secretbox2.c +secretbox2_LDADD = $(TESTS_LDADD) + +secretbox7_SOURCE = cmptest.h secretbox7.c +secretbox7_LDADD = $(TESTS_LDADD) + +secretbox8_SOURCE = cmptest.h secretbox8.c +secretbox8_LDADD = $(TESTS_LDADD) + +shorthash_SOURCE = cmptest.h shorthash.c +shorthash_LDADD = $(TESTS_LDADD) + +stream_SOURCE = cmptest.h stream.c +stream_LDADD = $(TESTS_LDADD) + +stream2_SOURCE = cmptest.h stream2.c +stream2_LDADD = $(TESTS_LDADD) + +stream3_SOURCE = cmptest.h stream3.c +stream3_LDADD = $(TESTS_LDADD) + +stream4_SOURCE = cmptest.h stream4.c +stream4_LDADD = $(TESTS_LDADD) + +verify: check diff --git a/test/auth.c b/test/default/auth.c similarity index 100% rename from test/auth.c rename to test/default/auth.c diff --git a/test/auth.exp b/test/default/auth.exp similarity index 100% rename from test/auth.exp rename to test/default/auth.exp diff --git a/test/auth2.c b/test/default/auth2.c similarity index 100% rename from test/auth2.c rename to test/default/auth2.c diff --git a/test/auth2.exp b/test/default/auth2.exp similarity index 100% rename from test/auth2.exp rename to test/default/auth2.exp diff --git a/test/auth3.c b/test/default/auth3.c similarity index 100% rename from test/auth3.c rename to test/default/auth3.c diff --git a/test/auth3.exp b/test/default/auth3.exp similarity index 100% rename from test/auth3.exp rename to test/default/auth3.exp diff --git a/test/auth5.c b/test/default/auth5.c similarity index 100% rename from test/auth5.c rename to test/default/auth5.c diff --git a/test/auth5.exp b/test/default/auth5.exp similarity index 100% rename from test/auth5.exp rename to test/default/auth5.exp diff --git a/test/box.c b/test/default/box.c similarity index 100% rename from test/box.c rename to test/default/box.c diff --git a/test/box.exp b/test/default/box.exp similarity index 100% rename from test/box.exp rename to test/default/box.exp diff --git a/test/box2.c b/test/default/box2.c similarity index 100% rename from test/box2.c rename to test/default/box2.c diff --git a/test/box2.exp b/test/default/box2.exp similarity index 100% rename from test/box2.exp rename to test/default/box2.exp diff --git a/test/box7.c b/test/default/box7.c similarity index 100% rename from test/box7.c rename to test/default/box7.c diff --git a/test/box7.exp b/test/default/box7.exp similarity index 100% rename from test/box7.exp rename to test/default/box7.exp diff --git a/test/box8.c b/test/default/box8.c similarity index 100% rename from test/box8.c rename to test/default/box8.c diff --git a/test/box8.exp b/test/default/box8.exp similarity index 100% rename from test/box8.exp rename to test/default/box8.exp diff --git a/test/cmptest.h b/test/default/cmptest.h similarity index 100% rename from test/cmptest.h rename to test/default/cmptest.h diff --git a/test/core1.c b/test/default/core1.c similarity index 100% rename from test/core1.c rename to test/default/core1.c diff --git a/test/core1.exp b/test/default/core1.exp similarity index 100% rename from test/core1.exp rename to test/default/core1.exp diff --git a/test/core2.c b/test/default/core2.c similarity index 100% rename from test/core2.c rename to test/default/core2.c diff --git a/test/core2.exp b/test/default/core2.exp similarity index 100% rename from test/core2.exp rename to test/default/core2.exp diff --git a/test/core3.c b/test/default/core3.c similarity index 100% rename from test/core3.c rename to test/default/core3.c diff --git a/test/core3.exp b/test/default/core3.exp similarity index 100% rename from test/core3.exp rename to test/default/core3.exp diff --git a/test/core4.c b/test/default/core4.c similarity index 100% rename from test/core4.c rename to test/default/core4.c diff --git a/test/core4.exp b/test/default/core4.exp similarity index 100% rename from test/core4.exp rename to test/default/core4.exp diff --git a/test/core5.c b/test/default/core5.c similarity index 100% rename from test/core5.c rename to test/default/core5.c diff --git a/test/core5.exp b/test/default/core5.exp similarity index 100% rename from test/core5.exp rename to test/default/core5.exp diff --git a/test/core6.c b/test/default/core6.c similarity index 100% rename from test/core6.c rename to test/default/core6.c diff --git a/test/core6.exp b/test/default/core6.exp similarity index 100% rename from test/core6.exp rename to test/default/core6.exp diff --git a/test/hash.c b/test/default/hash.c similarity index 100% rename from test/hash.c rename to test/default/hash.c diff --git a/test/hash.exp b/test/default/hash.exp similarity index 100% rename from test/hash.exp rename to test/default/hash.exp diff --git a/test/hash2.exp b/test/default/hash2.exp similarity index 100% rename from test/hash2.exp rename to test/default/hash2.exp diff --git a/test/hash3.c b/test/default/hash3.c similarity index 100% rename from test/hash3.c rename to test/default/hash3.c diff --git a/test/hash3.exp b/test/default/hash3.exp similarity index 100% rename from test/hash3.exp rename to test/default/hash3.exp diff --git a/test/onetimeauth.c b/test/default/onetimeauth.c similarity index 100% rename from test/onetimeauth.c rename to test/default/onetimeauth.c diff --git a/test/onetimeauth.exp b/test/default/onetimeauth.exp similarity index 100% rename from test/onetimeauth.exp rename to test/default/onetimeauth.exp diff --git a/test/onetimeauth2.c b/test/default/onetimeauth2.c similarity index 100% rename from test/onetimeauth2.c rename to test/default/onetimeauth2.c diff --git a/test/onetimeauth2.exp b/test/default/onetimeauth2.exp similarity index 100% rename from test/onetimeauth2.exp rename to test/default/onetimeauth2.exp diff --git a/test/onetimeauth7.c b/test/default/onetimeauth7.c similarity index 100% rename from test/onetimeauth7.c rename to test/default/onetimeauth7.c diff --git a/test/onetimeauth7.exp b/test/default/onetimeauth7.exp similarity index 100% rename from test/onetimeauth7.exp rename to test/default/onetimeauth7.exp diff --git a/test/randombytes.c b/test/default/randombytes.c similarity index 100% rename from test/randombytes.c rename to test/default/randombytes.c diff --git a/test/scalarmult.c b/test/default/scalarmult.c similarity index 100% rename from test/scalarmult.c rename to test/default/scalarmult.c diff --git a/test/scalarmult.exp b/test/default/scalarmult.exp similarity index 100% rename from test/scalarmult.exp rename to test/default/scalarmult.exp diff --git a/test/scalarmult2.c b/test/default/scalarmult2.c similarity index 100% rename from test/scalarmult2.c rename to test/default/scalarmult2.c diff --git a/test/scalarmult2.exp b/test/default/scalarmult2.exp similarity index 100% rename from test/scalarmult2.exp rename to test/default/scalarmult2.exp diff --git a/test/scalarmult5.c b/test/default/scalarmult5.c similarity index 100% rename from test/scalarmult5.c rename to test/default/scalarmult5.c diff --git a/test/scalarmult5.exp b/test/default/scalarmult5.exp similarity index 100% rename from test/scalarmult5.exp rename to test/default/scalarmult5.exp diff --git a/test/scalarmult6.c b/test/default/scalarmult6.c similarity index 100% rename from test/scalarmult6.c rename to test/default/scalarmult6.c diff --git a/test/scalarmult6.exp b/test/default/scalarmult6.exp similarity index 100% rename from test/scalarmult6.exp rename to test/default/scalarmult6.exp diff --git a/test/secretbox.c b/test/default/secretbox.c similarity index 100% rename from test/secretbox.c rename to test/default/secretbox.c diff --git a/test/secretbox.exp b/test/default/secretbox.exp similarity index 100% rename from test/secretbox.exp rename to test/default/secretbox.exp diff --git a/test/secretbox2.c b/test/default/secretbox2.c similarity index 100% rename from test/secretbox2.c rename to test/default/secretbox2.c diff --git a/test/secretbox2.exp b/test/default/secretbox2.exp similarity index 100% rename from test/secretbox2.exp rename to test/default/secretbox2.exp diff --git a/test/secretbox7.c b/test/default/secretbox7.c similarity index 100% rename from test/secretbox7.c rename to test/default/secretbox7.c diff --git a/test/secretbox7.exp b/test/default/secretbox7.exp similarity index 100% rename from test/secretbox7.exp rename to test/default/secretbox7.exp diff --git a/test/secretbox8.c b/test/default/secretbox8.c similarity index 100% rename from test/secretbox8.c rename to test/default/secretbox8.c diff --git a/test/secretbox8.exp b/test/default/secretbox8.exp similarity index 100% rename from test/secretbox8.exp rename to test/default/secretbox8.exp diff --git a/test/shorthash.c b/test/default/shorthash.c similarity index 100% rename from test/shorthash.c rename to test/default/shorthash.c diff --git a/test/shorthash.exp b/test/default/shorthash.exp similarity index 100% rename from test/shorthash.exp rename to test/default/shorthash.exp diff --git a/test/stream.c b/test/default/stream.c similarity index 100% rename from test/stream.c rename to test/default/stream.c diff --git a/test/stream.exp b/test/default/stream.exp similarity index 100% rename from test/stream.exp rename to test/default/stream.exp diff --git a/test/stream2.c b/test/default/stream2.c similarity index 100% rename from test/stream2.c rename to test/default/stream2.c diff --git a/test/stream2.exp b/test/default/stream2.exp similarity index 100% rename from test/stream2.exp rename to test/default/stream2.exp diff --git a/test/stream3.c b/test/default/stream3.c similarity index 100% rename from test/stream3.c rename to test/default/stream3.c diff --git a/test/stream3.exp b/test/default/stream3.exp similarity index 100% rename from test/stream3.exp rename to test/default/stream3.exp diff --git a/test/stream4.c b/test/default/stream4.c similarity index 100% rename from test/stream4.c rename to test/default/stream4.c diff --git a/test/stream4.exp b/test/default/stream4.exp similarity index 100% rename from test/stream4.exp rename to test/default/stream4.exp diff --git a/test/windows/windows-quirks.h b/test/quirks/windows/windows-quirks.h similarity index 100% rename from test/windows/windows-quirks.h rename to test/quirks/windows/windows-quirks.h