From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Rob Browning Newsgroups: gmane.lisp.guile.bugs Subject: bug#72085: test-suite missing dependency on guile-procedures.txt Date: Fri, 12 Jul 2024 19:39:56 -0500 Message-ID: <87jzhqw2eb.fsf@trouble.defaultvalue.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32224"; mail-complaints-to="usenet@ciao.gmane.io" To: 72085@debbugs.gnu.org Original-X-From: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Sat Jul 13 02:41:30 2024 Return-path: Envelope-to: guile-bugs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sSQpN-0008Aq-51 for guile-bugs@m.gmane-mx.org; Sat, 13 Jul 2024 02:41:29 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSQox-0001KU-RI; Fri, 12 Jul 2024 20:41:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSQow-0001KM-DW for bug-guile@gnu.org; Fri, 12 Jul 2024 20:41:02 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSQow-0003bl-58 for bug-guile@gnu.org; Fri, 12 Jul 2024 20:41:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSQow-00047L-JT for bug-guile@gnu.org; Fri, 12 Jul 2024 20:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Rob Browning Original-Sender: "Debbugs-submit" Resent-CC: bug-guile@gnu.org Resent-Date: Sat, 13 Jul 2024 00:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72085 X-GNU-PR-Package: guile X-Debbugs-Original-To: bug-guile@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.172083120515733 (code B ref -1); Sat, 13 Jul 2024 00:41:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jul 2024 00:40:05 +0000 Original-Received: from localhost ([127.0.0.1]:54888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSQo1-00045h-81 for submit@debbugs.gnu.org; Fri, 12 Jul 2024 20:40:05 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:60832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSQny-00045V-AD for submit@debbugs.gnu.org; Fri, 12 Jul 2024 20:40:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSQnv-0000zx-SO for bug-guile@gnu.org; Fri, 12 Jul 2024 20:40:01 -0400 Original-Received: from defaultvalue.org ([45.33.119.55]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSQnu-0003Cz-2W for bug-guile@gnu.org; Fri, 12 Jul 2024 20:39:59 -0400 Original-Received: from trouble.defaultvalue.org (localhost [127.0.0.1]) (Authenticated sender: rlb@defaultvalue.org) by defaultvalue.org (Postfix) with ESMTPSA id 51129202C2 for ; Fri, 12 Jul 2024 19:39:57 -0500 (CDT) Original-Received: by trouble.defaultvalue.org (Postfix, from userid 1000) id E732214E05C; Fri, 12 Jul 2024 19:39:56 -0500 (CDT) Received-SPF: pass client-ip=45.33.119.55; envelope-from=rlb@defaultvalue.org; helo=defaultvalue.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guile@gnu.org List-Id: "Bug reports for GUILE, GNU's Ubiquitous Extension Language" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Original-Sender: bug-guile-bounces+guile-bugs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.lisp.guile.bugs:10894 Archived-At: --=-=-= Content-Type: text/plain Some of the tests in the test-suite depend on guile-procedures.txt, but nothing currently indicates that, and so a build in a clean tree may fail. This patch tries to fix that: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Ensure-tests-have-guile-procedures.txt.patch Content-Description: 0001-Ensure-tests-have-guile-procedures.txt.patch >From 2e391649fc17c1ecaa297e5ce4bf2bfae0963eaf Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 30 Jun 2024 12:38:35 -0500 Subject: [PATCH 1/1] Ensure tests have guile-procedures.txt The tests depend on libguile/guile-procedures.txt, for example via documented? in bit-operations.test. Previously "make check -j..." in a clean tree would fail because libguile/guile-procedures.txt is built by ./Makefile.am (rather than libguile/Makefile.am) so that it will have a built module/ available, but when "." is not listed in SUBDIRS, it builds last, and so the test-suite runs before guile-procedures.txt is built. To fix the problem add "." to SUBDIRS before the test-suite so that the tests will be able depend on everything else, and move the existing guile-procedures.txt target into libguile/ next to its guile-procedures.texi dependency. That gives a better overview and simplifies the recipe a bit. It also allows us to drop the explict "all-local:" dependency, and to let the existing libguile/ code handle the cleanup. * Makefile.am (SUBDIRS): add . just before the test-suite. (libguile/guile-procedures.txt): rely on libguile/Makefile.am. (CLEANFILES): Drop libguile/procedures.txt. * libguile/Makefile.am: (all-local): drop. (libguile/guile-procedures.txt): move Makefile.am recipe here. --- Makefile.am | 20 ++++++++------------ libguile/Makefile.am | 15 +++++++++------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index c74761628..6d73625c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,8 @@ # AUTOMAKE_OPTIONS = 1.10 +# The test-suite goes last so that it can depend on everything else +# (e.g. guile-procedures.txt). SUBDIRS = \ lib \ meta \ @@ -36,8 +38,9 @@ SUBDIRS = \ stage2 \ guile-readline \ examples \ - test-suite \ - doc + doc \ + . \ + test-suite DIST_SUBDIRS = $(SUBDIRS) prebuilt @@ -57,15 +60,9 @@ BUILT_SOURCES = libguile/scmconfig.h libguile/scmconfig.h: $(MAKE) -C libguile scmconfig.h -# Build it from here so that all the modules are compiled by the time we -# build it. -libguile/guile-procedures.txt: libguile/guile-procedures.texi - $(AM_V_GEN) \ - $(top_builddir)/meta/guile --no-auto-compile \ - "$(srcdir)/libguile/texi-fragments-to-docstrings" \ - "$(builddir)/libguile/guile-procedures.texi" \ - > $@.tmp - @mv $@.tmp $@ +# Build it here so that (given SUBDIRS order) the modules are available +libguile/guile-procedures.txt: + $(MAKE) -C libguile guile-procedures.txt EXTRA_DIST = LICENSE HACKING GUILE-VERSION \ am/maintainer-dirs \ @@ -87,7 +84,6 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION \ ACLOCAL_AMFLAGS = -I m4 -CLEANFILES = libguile/guile-procedures.txt DISTCLEANFILES = check-guile.log DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning --enable-mini-gmp diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 8d8fa27d7..3ea2e57da 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -472,10 +472,6 @@ BUILT_INCLUDES = vm-operations.h scmconfig.h libpath.h srfi-14.i.c BUILT_SOURCES = cpp-E.c cpp-SIG.c $(BUILT_INCLUDES) \ $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) -# Force the generation of `guile-procedures.texi' because the top-level -# Makefile expects it to be built. -all-local: guile-procedures.texi - EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ syscalls.h \ dynl.c regex-posix.c \ @@ -739,8 +735,6 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads \ unidata_to_charset.awk UnicodeData.txt \ vm-operations.h libguile-@GUILE_EFFECTIVE_VERSION@-gdb.scm \ $(lightening_c_files) $(lightening_extra_files) -# $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \ -# guile-procedures.txt guile.texi ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds. if MINGW_LIBPATH @@ -858,6 +852,15 @@ guile.texi: $(alldotdocfiles) guile$(EXEEXT) guile-procedures.texi: $(alldotdocfiles) guile$(EXEEXT) $(AM_V_GEN)$(dotdoc2texi) > $@ || { rm $@; false; } +# Requires meta to be listed before libguile in SUBDIRS +guile-procedures.txt: guile-procedures.texi + $(AM_V_GEN) \ + $(top_builddir)/meta/guile --no-auto-compile \ + "$(srcdir)/texi-fragments-to-docstrings" \ + "$(builddir)/guile-procedures.texi" \ + > $@.tmp + @mv $@.tmp $@ + c-tokenize.c: c-tokenize.lex flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; } -- 2.43.0 --=-=-= Content-Type: text/plain -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4 --=-=-=--