From 3e24c764c096dd736f1d9d7ee3cfbce71aec9741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Tue, 3 Oct 2023 20:53:03 +0200
Subject: [PATCH] Limit check-fat testing to relevant testcases.

---
 ChangeLog             | 6 ++++++
 Makefile.in           | 2 +-
 testsuite/Makefile.in | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 47a5a06a..14ecb84b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2023-10-03  Niels Möller  <nisse@lysator.liu.se>
 
+	* Makefile.in (check-fat): Reduce tests to run to TS_FAT, to speed
+	up tests.
+
+	* testsuite/Makefile.in (TS_FAT): Define list of tests relevant
+	for testing algorithm variants in fat builds.
+
 	* testsuite/ecc-mod-arith-test.c: Reduce test count, aiming to get
 	test to complete in roughly 0.1s.
 	* testsuite/ecc-mod-test.c: Likewise.
diff --git a/Makefile.in b/Makefile.in
index f031e195..2d38ae85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ check-fat:
 	[ -z "$(FAT_TEST_LIST)" ] || \
 	  set -e; cd testsuite && for f in $(FAT_TEST_LIST) ; do \
 	    echo NETTLE_FAT_OVERRIDE=$$f ; \
-	    NETTLE_FAT_OVERRIDE=$$f $(MAKE) check ; \
+	    NETTLE_FAT_OVERRIDE=$$f $(MAKE) check TS_ALL='$$(TS_FAT)' ; \
 	  done
 
 all-here: $(TARGETS) $(DOCTARGETS)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 60c413cd..2aa1dd81 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -68,6 +68,12 @@ TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
 TARGETS = $(TS_C) $(TS_CXX)
 TS_SH = symbols-test
 TS_ALL = $(TARGETS) $(TS_SH) @IF_DLOPEN_TEST@ dlopen-test$(EXEEXT)
+
+TS_FAT = $(patsubst %, %$(EXEEXT), aes-test cbc-test \
+	chacha-test salsa20-test memxor-test \
+	sha1-test sha256-test sha512-test sha3-permute-test sha3-512-test \
+	umac-test gcm-test siv-gcm-test)
+
 EXTRA_SOURCES = sha1-huge-test.c
 EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
 
-- 
GitLab