Remaniement de la gestion des tests

Permettra d'ajouter un nouveau test plus facilement.

7 files changed, 20 insertions, 20 deletions

diff --git a/crypto_aead/lilliputaei128v1/ref/Makefile b/crypto_aead/lilliputaei128v1/ref/Makefile
index a921f51..3c73db8 100644
--- a/crypto_aead/lilliputaei128v1/ref/Makefile
+++ b/crypto_aead/lilliputaei128v1/ref/Makefile
@@ -1,4 +1,6 @@
-.PHONY: clean test-tweakey
+tests = test-tweakey
+
+.PHONY: clean $(tests)
 
 
 nist_flags = -std=c99 -Wall -Wextra -Wshadow -fsanitize=address,undefined -O2
@@ -15,16 +17,16 @@ results/%.o: %.c
 	@mkdir -p $(dir $@)
 	gcc -c -I. $< $(nist_flags) -Werror -o $@
 
-results/test-%: results/test/%.o
-
-results/test-tweakey: results/test/tweakey.o results/tweakey.o results/constants.o | results
+results/test-%: results/test/test-%.o
 	gcc $^ $(nist_flags) -Werror -o $@
 
-test-tweakey: results/test-tweakey
-	mkdir -p results/tweakey
-	./results/test-tweakey
-	./test/tweakey.sh test/tweakey-ref results/tweakey
+$(tests): %: results/%
+	mkdir -p results/$@-output
+	./results/$@ results/$@-output
+	diff -ru test/$*-ref results/$@-output
+
 
+results/test-tweakey: results/tweakey.o results/constants.o | results
 
 results/test-tweakey.o: tweakey.h
 results/tweakey.o: tweakey.h constants.h
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_full.txt b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_full.txt
index ef346d2..ef346d2 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_full.txt
+++ b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_full.txt
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_null.txt b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_null.txt
index ed7938b..ed7938b 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_null.txt
+++ b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_null.txt
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_order.txt b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_order.txt
index b727244..b727244 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_order.txt
+++ b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_order.txt
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_random.txt b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_random.txt
index 529e39d..529e39d 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey-ref/tweakey_random.txt
+++ b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey-ref/tweakey_random.txt
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey.c b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey.c
index 1f5aacf..53ea14c 100644
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey.c
+++ b/crypto_aead/lilliputaei128v1/ref/test/test-tweakey.c
@@ -76,20 +76,26 @@ vector_input VECTORS[] = {
 };
 
 
-FILE* open_dump_file(const char * name)
+FILE* open_dump_file(const char *folder, const char *name)
 {
     char filename[128];
-    snprintf(filename, sizeof(filename), "results/tweakey/tweakey_%s.txt", name);
+    snprintf(filename, sizeof(filename), "%s/tweakey_%s.txt", folder, name);
     return fopen(filename, "w");
 }
 
 
-int main()
+int main(int argc, char const * const *argv)
 {
+    if (argc < 2)
+    {
+        fprintf(stderr, "usage: %s OUTPUT-FOLDER\n", argv[0]);
+        return 1;
+    }
+
     for (vector_input* input=VECTORS; input<ARRAY_END(VECTORS); input++) 
     {
         printf("%s\n", input->name);
-        FILE* dump = open_dump_file(input->name);
+        FILE* dump = open_dump_file(argv[1], input->name);
 
         fprintf(dump, "Building Tweakey :\n");
 
diff --git a/crypto_aead/lilliputaei128v1/ref/test/tweakey.sh b/crypto_aead/lilliputaei128v1/ref/test/tweakey.sh
deleted file mode 100755
index 653d13e..0000000
--- a/crypto_aead/lilliputaei128v1/ref/test/tweakey.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-reference=$1
-actual=$2
-
-diff -ru ${reference} ${actual}