From f39b300e4ebc1bc11c4359dc8b6b6f0471149275 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Thu, 18 Apr 2019 11:21:30 +0200 Subject: [PATCH] Reduce number of tests for functest --- test/Makefile | 5 ++++- test/crypto_kem/functest.c | 2 ++ test/crypto_sign/functest.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 43966398..30a0af29 100644 --- a/test/Makefile +++ b/test/Makefile @@ -20,6 +20,9 @@ CFLAGS=-O3 -Wall -Wextra -Wpedantic -Werror -std=c99 \ -fstrict-aliasing -fno-common -pipe \ -I$(COMMON_DIR) $(EXTRAFLAGS) +# Number of tests run for functests +NTESTS=1 + all: $(DEST_DIR)/functest_$(SCHEME)_$(IMPLEMENTATION) \ $(DEST_DIR)/testvectors_$(SCHEME)_$(IMPLEMENTATION) \ $(DEST_DIR)/printparams_$(SCHEME)_$(IMPLEMENTATION) @@ -50,7 +53,7 @@ $(DEST_DIR)/test_common_%: common/%.c $(COMMON_FILES) $(DEST_DIR)/functest_$(SCHEME)_$(IMPLEMENTATION): build-scheme crypto_$(TYPE)/functest.c $(COMMON_FILES) $(COMMON_DIR)/randombytes.c $(COMMON_HEADERS) mkdir -p $(DEST_DIR) - $(CC) $(CFLAGS) -DPQCLEAN_NAMESPACE=PQCLEAN_$(SCHEME_UPPERCASE)_$(IMPLEMENTATION_UPPERCASE) -I$(SCHEME_DIR) crypto_$(TYPE)/functest.c $(COMMON_FILES) $(COMMON_DIR)/notrandombytes.c -o $@ -L$(SCHEME_DIR) -l$(SCHEME)_$(IMPLEMENTATION) + $(CC) $(CFLAGS) -DNTESTS=$(NTESTS) -DPQCLEAN_NAMESPACE=PQCLEAN_$(SCHEME_UPPERCASE)_$(IMPLEMENTATION_UPPERCASE) -I$(SCHEME_DIR) crypto_$(TYPE)/functest.c $(COMMON_FILES) $(COMMON_DIR)/notrandombytes.c -o $@ -L$(SCHEME_DIR) -l$(SCHEME)_$(IMPLEMENTATION) $(DEST_DIR)/testvectors_$(SCHEME)_$(IMPLEMENTATION): build-scheme crypto_$(TYPE)/testvectors.c $(COMMON_FILES) $(COMMON_DIR)/notrandombytes.c $(COMMON_HEADERS) mkdir -p $(DEST_DIR) diff --git a/test/crypto_kem/functest.c b/test/crypto_kem/functest.c index fcc34fd1..8e131e07 100644 --- a/test/crypto_kem/functest.c +++ b/test/crypto_kem/functest.c @@ -5,7 +5,9 @@ #include "api.h" #include "randombytes.h" +#ifndef NTESTS #define NTESTS 5 +#endif const uint8_t canary[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF diff --git a/test/crypto_sign/functest.c b/test/crypto_sign/functest.c index baef6035..bd729194 100644 --- a/test/crypto_sign/functest.c +++ b/test/crypto_sign/functest.c @@ -6,7 +6,10 @@ #include "api.h" #include "randombytes.h" +#ifndef NTESTS #define NTESTS 5 +#endif + #define MLEN 32 const uint8_t canary[8] = {