Fix distribution of side channel tests.

diff --git a/ChangeLog b/ChangeLog
index cc6d514ed837aef82bd327bf5f37a794b2eba57d..fe7974c893630627f72c4772a55964bc0aec5d64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-06-15  Niels Möller  <nisse@lysator.liu.se>
+
+       * testsuite/Makefile.in (TS_SC_NETTLE): New variable.
+       (DISTFILES): Unconditionally include side-channel tests,
+       fix accidental dependence on IF_VALGRIND.
+
 2024-06-11  Niels Möller  <nisse@lysator.liu.se>
 
        * fat-arm64.c: Enable use of getauxval on android, for

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index de7fa590ff2cb7c7530057ed42da2c5716c00169..0699fa0d230ba528a395372b1465b1c3d236bc47 100644 (file)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -68,15 +68,16 @@ TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(EXEEXT))
 TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED)
 TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
 TARGETS = $(TS_C) $(TS_CXX)
+
 TS_SC_HOGWEED = sc-pkcs1-sec-decrypt-test sc-rsa-sec-decrypt-test \
        sc-rsa-oaep-encrypt-test \
        sc-ecdsa-sign-test sc-curve25519-dh-test sc-curve448-dh-test \
        sc-ed25519-test sc-ed448-test
-TS_SC = sc-cnd-memcpy-test sc-gcm-test sc-memeql-test \
-       @IF_HOGWEED@ $(TS_SC_HOGWEED)
+TS_SC_NETTLE = sc-cnd-memcpy-test sc-gcm-test sc-memeql-test
+TS_SC = @IF_VALGRIND@ $(TS_SC_NETTLE) @IF_HOGWEED@ $(TS_SC_HOGWEED)
 
-TS_SH = symbols-test @IF_VALGRIND@ $(TS_SC)
-TS_ALL = $(TARGETS) $(TS_SH) @IF_DLOPEN_TEST@ dlopen-test$(EXEEXT)
+TS_SH = symbols-test
+TS_ALL = $(TARGETS) $(TS_SH) $(TS_SC) @IF_DLOPEN_TEST@ dlopen-test$(EXEEXT)
 
 TS_FAT = $(patsubst %, %$(EXEEXT), aes-test cbc-test \
        chacha-test salsa20-test memxor-test \
@@ -91,7 +92,7 @@ EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
 SOURCES = $(TS_SOURCES) $(EXTRA_SOURCES) testutils.c dlopen-test.c
 
 DISTFILES = $(SOURCES) $(CXX_SOURCES) Makefile.in \
-           $(TS_SH) sc-valgrind.sh gold-bug.txt testutils.h sha3.awk
+           $(TS_SH) $(TS_SC_NETTLE) $(TS_SC_HOGWEED) sc-valgrind.sh gold-bug.txt testutils.h sha3.awk
 
 all: $(EXTRA_TARGETS)