GNU bug report logs - #63074
[PATCH 0/2] Fix tests to prepare for guix package upgrade

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63074 in the body.
You can then email your comments to 63074 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: guix-patches <at> gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>
Subject: [PATCH 0/2] Fix tests to prepare for guix package upgrade
Date: Tue, 25 Apr 2023 22:00:42 +0200

Hello everyone,

This should fix both failing tests that otherwise prevent us from upgrading
the `guix` package.  The latter will follow once these commits land into
master.

Best,

Josselin Poiret (2):
  tests: guix-build.sh: Don't use hidden gcc for transformation tests.
  tests: guix-graph.sh: Fix expected path from emacs to libffi.

 tests/guix-build.sh | 6 +++---
 tests/guix-graph.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


base-commit: 72b1c9713b8272add8bd9fb9e7f5246b39ba6db2
-- 
2.39.2

Message #8 received at 63074 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Josselin Poiret <dev <at> jpoiret.xyz>,
	63074 <at> debbugs.gnu.org
Subject: [PATCH 1/2] tests: guix-build.sh: Don't use hidden gcc for
 transformation tests.
Date: Tue, 25 Apr 2023 22:16:41 +0200

* tests/guix-build.sh: Do not try to rewrite gcc, it is hidden and so will not
be rewritten, as per eee95b5a879b7096dffd533f24107cf8926b621e.  Instead, try
to build grep with coreutils rewritten to hello.
---
 tests/guix-build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 2c59177c86..317c58ac42 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -318,10 +318,10 @@ drv2=`guix build inkscape -d --no-grafts --with-graft=glib=glib-networking`
 test "$drv1" = "$drv2"
 
 # Rewriting implicit inputs.
-drv1=`guix build hello -d`
-drv2=`guix build hello -d --with-input=gcc=gcc-toolchain`
+drv1=`guix build grep -d`
+drv2=`guix build grep -d --with-input=coreutils=hello`
 test "$drv1" != "$drv2"
-guix gc -R "$drv2" | grep `guix build -d gcc-toolchain`
+guix gc -R "$drv2" | grep `guix build -d hello`
 
 guix build guile --with-input=libunistring=something-really-silly && false
 
-- 
2.39.2

Message #11 received at 63074 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: Josselin Poiret <dev <at> jpoiret.xyz>,
	63074 <at> debbugs.gnu.org
Subject: [PATCH 2/2] tests: guix-graph.sh: Fix expected path from emacs to
 libffi.
Date: Tue, 25 Apr 2023 22:16:42 +0200

* tests/guix-graph.sh: Change the expected path from emacs to libffi.  `guix
graph --path` outputs only one possible path, and the one it outputs for this
case has changed.
---
 tests/guix-graph.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh
index 9824c6a65a..37ea0a7b8c 100644
--- a/tests/guix-graph.sh
+++ b/tests/guix-graph.sh
@@ -87,7 +87,7 @@ guix graph --path emacs vim && false
 path="\
 emacs
 gnutls
-guile
+p11-kit
 libffi"
 test "`guix graph --path emacs libffi | cut -d '@' -f1`" = "$path"
 
-- 
2.39.2

Message #16 received at 63074-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Josselin Poiret <dev <at> jpoiret.xyz>
Cc: 63074-done <at> debbugs.gnu.org
Subject: Re: bug#63074: [PATCH 0/2] Fix tests to prepare for guix package
 upgrade
Date: Fri, 28 Apr 2023 19:52:27 +0200

Hi,

Josselin Poiret <dev <at> jpoiret.xyz> skribis:

>   tests: guix-build.sh: Don't use hidden gcc for transformation tests.
>   tests: guix-graph.sh: Fix expected path from emacs to libffi.

Applied, thanks!

Ludo’.

Message #19 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: Josselin Poiret via Guix-patches via <guix-patches <at> gnu.org>, Josselin
 Poiret <dev <at> jpoiret.xyz>, 63074 <at> debbugs.gnu.org
Subject: Re: [bug#63074] [PATCH 2/2] tests: guix-graph.sh: Fix expected path
 from emacs to libffi.
Date: Tue, 16 May 2023 14:57:05 +0200

Hi Josselin,

On Tue, 25 Apr 2023 at 22:16, Josselin Poiret via Guix-patches via <guix-patches <at> gnu.org> wrote:
> * tests/guix-graph.sh: Change the expected path from emacs to libffi.  `guix
> graph --path` outputs only one possible path, and the one it outputs for this
> case has changed.
> ---
>  tests/guix-graph.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/guix-graph.sh b/tests/guix-graph.sh
> index 9824c6a65a..37ea0a7b8c 100644
> --- a/tests/guix-graph.sh
> +++ b/tests/guix-graph.sh
> @@ -87,7 +87,7 @@ guix graph --path emacs vim && false
>  path="\
>  emacs
>  gnutls
> -guile
> +p11-kit
>  libffi"
>  test "`guix graph --path emacs libffi | cut -d '@' -f1`" = "$path"

Hum, that’s annoying.  Well, indeed “guix graph --path” returns one of
the shortest paths.  And this result depends on how the graph is built
and then walked.  That’s deterministic (should be!) but can depend on
the Guix revision.

Well, does it make sense to check the equality of such specific path?

Maybe, instead the test could check some invariant property.  For
instance, that the length of the path between two packages must be the
same as between the same packages but with a package transformation
(replacement or else).

Or some others.  For example, that the length from A to C is equal to the
length from A to B added to the length from B to C.

WDYT?

Cheers,
simon

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.