summaryrefslogtreecommitdiff
path: root/test/common.mk
diff options
context:
space:
mode:
Diffstat (limited to 'test/common.mk')
-rw-r--r--test/common.mk40
1 files changed, 4 insertions, 36 deletions
diff --git a/test/common.mk b/test/common.mk
index 677dcbe..31e84b0 100644
--- a/test/common.mk
+++ b/test/common.mk
@@ -10,12 +10,7 @@ endif
# Use "make IMPLEMENTATION=..." to compile against other versions.
IMPLEMENTATION = ref
-
-tests = $(basename $(wildcard test-*.c))
-traces = $(basename $(wildcard traces-*.c))
-
-
-test_dir = $(dir $(lastword $(MAKEFILE_LIST)))
+test_dir := $(dir $(lastword $(MAKEFILE_LIST)))
root_dir = $(test_dir)..
results_dir = $(root_dir)/results/$(mode)-$(keylen)
src_dir = $(root_dir)/src/$(IMPLEMENTATION)
@@ -27,6 +22,9 @@ CFLAGS += -I$(src_dir) -I$(variant_dir) -I$(test_dir) $(nist_flags) -Werror
LDFLAGS += $(nist_flags)
+include $(src_dir)/implem.mk
+
+
.PHONY: clean test $(tests) traces $(traces)
@@ -64,35 +62,5 @@ $(results_dir)/src/%.o: $(src_dir)/%.c | $(results_dir)/src
$(Q) gcc -c $< $(CFLAGS) -o $@
-# Program => additional objects dependencies
-
-$(results_dir)/test-tbc-decrypt $(results_dir)/test-tbc-encrypt $(results_dir)/traces-tbc: \
-$(results_dir)/src/cipher.o $(results_dir)/src/tweakey.o
-
-$(results_dir)/test-ae-decrypt $(results_dir)/test-ae-encrypt $(results_dir)/test-ae-roundtrip $(results_dir)/traces-ae: \
-$(results_dir)/src/lilliput-$(mode).o $(results_dir)/src/cipher.o \
-$(results_dir)/src/tweakey.o
-
-$(results_dir)/test-tweakey: $(results_dir)/src/tweakey.o
-
-# Object => headers dependencies
-
-$(results_dir)/$(src_dir)/cipher.o: $(src_dir)/cipher.h \
-$(src_dir)/tweakey.h $(variant_dir)/parameters.h
-
-$(results_dir)/$(src_dir)/lilliput-i.o $(results_dir)/$(src_dir)/lilliput-ii.o: \
-$(src_dir)/lilliput-ae.h $(src_dir)/cipher.h $(src_dir)/constants.h \
-$(variant_dir)/parameters.h
-
-$(results_dir)/$(src_dir)/tweakey.o: $(src_dir)/tweakey.h \
-$(src_dir)/constants.h $(variant_dir)/parameters.h
-
-$(results_dir)/test/test-tbc-encrypt.o $(results_dir)/test/test-tbc-decrypt.o $(results_dir)/test/traces-tbc.o: \
-$(src_dir)/cipher.h
-
-$(results_dir)/test/test-ae-encrypt.o $(results_dir)/test/test-ae-decrypt.o $(results_dir)/test/test-ae-roundtrip.o $(results_dir)/test/traces-ae.o: \
-$(src_dir)/lilliput-ae.h
-
-
# TODO: add valgrind, although it does not seem to play well with ASAN
# TODO: use gcc -M... to generate .o -> .h dependencies