From 8dc90c5573b70c48a3e97a1d77d4834f960983d5 Mon Sep 17 00:00:00 2001
From: Loup Vaillant <loup@loup-vaillant.fr>
Date: Tue, 10 Dec 2019 21:37:42 +0100
Subject: [PATCH] Tweaked dist.sh

---
 dist.sh       | 20 ++++++++++++++++----
 tests/test.sh |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/dist.sh b/dist.sh
index c301625..5b3d6ef 100755
--- a/dist.sh
+++ b/dist.sh
@@ -6,10 +6,8 @@ VERSION=`git describe --tags`
 FOLDER=monocypher-$VERSION
 TARBALL=$FOLDER.tar.gz
 
-# Run the tests before we do anything.  It's not enough (we ought to run
-# the tests from the tarball itself, including the TIS interpreter), but
-# it should prevent the most egregious errors.
-tests/test.sh
+# Generate the test vectors.
+(cd tests/gen/ make)
 
 # Generate documentation for users who don't have mandoc
 doc/man2html.sh
@@ -37,3 +35,17 @@ tar -cvzf $TARBALL $FOLDER
 
 # Remove the temporary folder
 rm -rf $FOLDER
+
+# Run tests in the tarball, to make sure we didn't screw up anything
+# important.  We're missing the TIS interpreter run, but that's a good
+# quick check.
+tar -xzf $TARBALL
+cd $FOLDER   # Extracting from the tarball, just to make sure
+tests/test.sh
+make clean
+make speed
+make speed-sodium
+make speed-tweetnacl
+make speed-hydrogen
+make speed-c25519
+make
diff --git a/tests/test.sh b/tests/test.sh
index 86d8d35..a41a345 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-make clean;  make test
+make clean;  make test; make test-legacy
 make clean;  make test CFLAGS="-DBLAKE2_NO_UNROLLING -O3"
 make clean;  make test CC="clang -std=c99" CFLAGS="-g -fsanitize=address"
 make clean;  make test CC="clang -std=c99" CFLAGS="-g -fsanitize=memory"
-- 
2.47.3