Nikos Mavrogiannopoulos nmav@redhat.com writes:
Subject: [PATCH 1/6] testsuite/Makefile.in: ensure .test-rules.make is regenerated
That is, regenerate when Makefile.in is modified.
Signed-off-by: Nikos Mavrogiannopoulos nmav@redhat.com
Applied, with some additional tweaks.
testsuite/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 590691c..8f18f84 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -96,7 +96,9 @@ dlopen-test$(EXEEXT): dlopen-test.$(OBJEXT) testutils.$(OBJEXT) $(LINK) dlopen-test.$(OBJEXT) -ldl -o dlopen-test$(EXEEXT)
.PHONY: test-rules -test-rules: +test-rules: .test-rules.make
+.test-rules.make: Makefile.in
I changed the target to $(srcdir)/.test-rules.make, to match the include line, I think that's needed for make to notice it can remake the include file. And I changed the dependency to Makefile rather than Makefile.in, which I think is more accurate.
(for f in $(TS_NETTLE) $(TS_HOGWEED) $(EXTRA_TARGETS) ; do \ echo $$f'$$(EXEEXT): '$$f'.$$(OBJEXT)' ; \ echo ' $$(LINK) '$$f'.$$(OBJEXT) $$(TEST_OBJS) -o '$$f'$$(EXEEXT)' ; \ @@ -107,6 +109,10 @@ test-rules: echo ' $$(LINK_CXX) '$$f'.$$(OBJEXT) $$(TEST_OBJS) -o '$$f'$$(EXEEXT)' ; \ echo ; \ done) > $(srcdir)/.test-rules.make
- @echo "******************************************************************"
- @echo "testsuite Makefile rules have been regenerated; please re-run make"
- @echo "******************************************************************"
- false
Not sure why we need to terminate with "false" here. By https://www.gnu.org/software/make/manual/html_node/Remaking-Makefiles.html, I think make ought to restart automatically when the included file $(srcdir)/.test-rules.make is updated, but in my tests, if I delete that false, that didn't happen.
include $(srcdir)/.test-rules.make
[3. text/x-patch; 0002-Added-the-TLS-1.0-PRF-and-test-vectors.patch]...
[4. text/x-patch; 0003-Added-the-TLS-1.2-PRF-and-test-vectors.patch]...
Can we postpone tls-1.0 and tls-1.2 for now, and try to get the more generally useful hkdf in?
[5. text/x-patch; 0004-Added-the-HKDF-key-derivation-function-and-test-vect.patch]...
I hope to be able to have a close look soon, but not tonight.
Regards, /Niels