Re: GNU Guix 1.3.0rc2 available for testing!

[Chris Marusich <cmmarusich@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3203 bytes --]

Hi Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Sorry for the delayed answer.

No worries!  I've waited even longer in replying to you now, so we're
even.  :-)

> The go importer depends on a recent version of guile-lib (0.2.7), which
> added a new #:strict argument to the HTML parser.  We should probably
> skip the test depending on the already available HAVE_GUILE_LIB Automake
> conditional, like so:
>
> modified   Makefile.am
> @@ -457,7 +457,6 @@ SCM_TESTS =					\
>    tests/git-authenticate.scm			\
>    tests/glob.scm				\
>    tests/gnu-maintenance.scm			\
> -  tests/go.scm					\
>    tests/grafts.scm				\
>    tests/graph.scm				\
>    tests/gremlin.scm				\
> @@ -505,6 +504,10 @@ SCM_TESTS =					\
>    tests/uuid.scm				\
>    tests/workers.scm
>  
> +if HAVE_GUILE_LIB
> +SCM_TESTS += tests/go.scm
> +endif
> +
>  if BUILD_DAEMON_OFFLOAD
>  SCM_TESTS  += tests/offload.scm
>  else
>
> Could you give the above a try?  Feel free to commit it if it works as
> expected.

I tested this, and it works.  Thank you!  I can now build the release
(with this change) and run the tests (make check) successfully;
tests/go.scm is just omitted from the tests to run.

By chance, I noticed the following lines below what you added:

--8<---------------cut here---------------start------------->8---
if HAVE_GUILE_LIB
SCM_TESTS += tests/go.scm
endif

if BUILD_DAEMON_OFFLOAD
SCM_TESTS  += tests/offload.scm
else
EXTRA_DIST += tests/offload.scm
endif
--8<---------------cut here---------------end--------------->8---

I guess that if we omit tests/go.scm from SCM_TESTS, it not only means
that the test won't be run, but it also means the test won't get
included in the tarball distribution ("make dist").  Is that right?  It
seems undesirable to omit this test from the distribution just because
the machine on which the distribution was built might have lacked the
library necessary to run the test.  Someone who builds Guix from the
distribution might actually have that library installed and thus be able
to run the test.  To ensure that this test always gets included in the
distribution, perhaps we should also add it to EXTRA_DIST like so:

--8<---------------cut here---------------start------------->8---
diff -u a/Makefile.am b/Makefile.am
--- a/Makefile.am       2021-05-11 11:09:31.000000000 -0700
+++ b/Makefile.am       2021-06-02 12:55:06.134793001 -0700
@@ -457,7 +457,6 @@
   tests/git-authenticate.scm                   \
   tests/glob.scm                               \
   tests/gnu-maintenance.scm                    \
-  tests/go.scm                                 \
   tests/grafts.scm                             \
   tests/graph.scm                              \
   tests/gremlin.scm                            \
@@ -505,6 +504,12 @@
   tests/uuid.scm                               \
   tests/workers.scm
 
+if HAVE_GUILE_LIB
+SCM_TESTS += tests/go.scm
+else
+EXTRA_DIST += tests/go.scm
+endif
+
 if BUILD_DAEMON_OFFLOAD
 SCM_TESTS  += tests/offload.scm
 else
--8<---------------cut here---------------end--------------->8---

What do you think?

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]