* [bug#69957] [PATCH gnome-team 1/2] gnu: duc: Fix build.
2024-03-23 7:29 [bug#69957] [PATCH gnome-team 0/2] Fix Duc build Vivien Kraus via Guix-patches via
@ 2024-03-23 7:12 ` Vivien Kraus via Guix-patches via
2024-03-23 10:15 ` Liliana Marie Prikler
2024-03-23 7:13 ` [bug#69957] [PATCH gnome-team 2/2] gnu: duc: Update style Vivien Kraus via Guix-patches via
1 sibling, 1 reply; 5+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2024-03-23 7:12 UTC (permalink / raw)
To: 69957; +Cc: rg, vivien, liliana.prikler, maxim.cournoyer
* gnu/packages/patches/duc-fix-test-sh.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/disk.scm (duc): Use it here.
Change-Id: I664614dc35fb88f8ee63dbe727a38f17f4af0f8e
---
gnu/local.mk | 1 +
gnu/packages/disk.scm | 4 +-
gnu/packages/patches/duc-fix-test-sh.patch | 70 ++++++++++++++++++++++
3 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/duc-fix-test-sh.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 2ea9806b7e..24103a4da7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1114,6 +1114,7 @@ dist_patch_DATA = \
%D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \
%D%/packages/patches/dstat-skip-devices-without-io.patch \
%D%/packages/patches/dtc-meson-cell-overflow.patch \
+ %D%/packages/patches/duc-fix-test-sh.patch \
%D%/packages/patches/dune-common-skip-failing-tests.patch \
%D%/packages/patches/dune-grid-add-missing-include-cassert.patch \
%D%/packages/patches/dune-istl-fix-solver-playground.patch \
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index b0117d77ce..ea18a98ab6 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1562,7 +1562,9 @@ (define-public duc
(file-name (git-file-name name version))
(sha256
(base32
- "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4"))))
+ "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4"))
+ (patches
+ (search-patches "duc-fix-test-sh.patch"))))
(build-system gnu-build-system)
(arguments
`(#:phases
diff --git a/gnu/packages/patches/duc-fix-test-sh.patch b/gnu/packages/patches/duc-fix-test-sh.patch
new file mode 100644
index 0000000000..8b79e4bd03
--- /dev/null
+++ b/gnu/packages/patches/duc-fix-test-sh.patch
@@ -0,0 +1,70 @@
+From a84835e481d9b5fcfc101bb1fa5aba38a245b6f3 Mon Sep 17 00:00:00 2001
+Message-ID: <a84835e481d9b5fcfc101bb1fa5aba38a245b6f3.1711177846.git.vivien@planete-kraus.eu>
+From: Fabio Natali <me@fabionatali.com>
+Date: Wed, 30 Aug 2023 11:35:40 +0100
+Subject: [PATCH] Fix test.sh which used to fail in some circumstances
+
+duc's behaviour may legitimately vary depending on the system it is being run
+on. The test.sh script used to fail in some circumstances as it was too strict
+and it did not account for some legitimate behaviour differences.
+
+Fix: update `test.sh' variable
+---
+
+This is a squash of pull request https://github.com/zevv/duc/pull/318,
+waiting to be merged.
+
+ test.sh | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index eb592be..7668499 100755
+--- a/test.sh
++++ b/test.sh
+@@ -130,8 +130,8 @@ fi
+ # Actual tests are below. If you add test cases above, these need to be tweaked.
+ #---------------------------------------------------------------------------------
+
+-
+-cat ${DUC_TEST_DIR}.out | grep -q "Indexed 77 files and 47 directories, (91869B apparent, 540672B actual)"
++# An exact match is expected on the apparent size; the actual size may vary.
++cat ${DUC_TEST_DIR}.out | grep -q "Indexed 77 files and 47 directories, (91869B apparent, [0-9]*B actual)"
+
+ if [ "$?" = "0" ]; then
+ echo "report: ok"
+@@ -153,16 +153,26 @@ if [ "$?" != "0" ]; then
+ exit 1
+ fi
+
+-testsum="33e2be27a9e70e81d4006a2d7b555948"
++# When two or more hard links point to the same file and when running duc with
++# the `--check-hard-links' option, only one of the hard links will be
++# counted. However, duc may pick up and display a different hard link depending
++# on the system it is being run on. Since our tests include three hard links to
++# the same file, we should be expecting three possible outcomes, all equally
++# valid, each corresponding to one of the following MD5 checksums.
++testsum0="78dbf880ef6917ea665fddb5ebb44428"
++testsum1="38ab7b7d1ec6ac57d672c5618371386d"
++testsum2="33e2be27a9e70e81d4006a2d7b555948"
+ md5sum ${DUC_TEST_DIR}.out > /tmp/.duc.md5sum
+-grep -q $testsum /tmp/.duc.md5sum
++grep -q "$testsum0\|$testsum1\|$testsum2" /tmp/.duc.md5sum
+
+ if [ "$?" = "0" ]; then
+ echo "md5sum: ok"
+ else
+ echo "md5sum: failed"
+- echo "expected: "
+- echo "$testsum ${DUC_TEST_DIR}.out"
++ echo "expected one of: "
++ echo "$testsum0 ${DUC_TEST_DIR}.out"
++ echo "$testsum1 ${DUC_TEST_DIR}.out"
++ echo "$testsum2 ${DUC_TEST_DIR}.out"
+ echo "got: "
+ cat /tmp/.duc.md5sum
+ exit 1
+
+base-commit: b8f9659688a38476df9f613be3342bb8e2d65402
+--
+2.41.0
+
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#69957] [PATCH gnome-team 2/2] gnu: duc: Update style.
2024-03-23 7:29 [bug#69957] [PATCH gnome-team 0/2] Fix Duc build Vivien Kraus via Guix-patches via
2024-03-23 7:12 ` [bug#69957] [PATCH gnome-team 1/2] gnu: duc: Fix build Vivien Kraus via Guix-patches via
@ 2024-03-23 7:13 ` Vivien Kraus via Guix-patches via
1 sibling, 0 replies; 5+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2024-03-23 7:13 UTC (permalink / raw)
To: 69957; +Cc: rg, vivien, liliana.prikler, maxim.cournoyer
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3673 bytes --]
* gnu/packages/disk.scm (duc) [arguments]: Convert to list of G-Expressions.
Change-Id: Iefcdcc55b1e71f7e866cb04795ef74f3b675cfce
---
gnu/packages/disk.scm | 55 ++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index ea18a98ab6..2e2c5739cc 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1567,33 +1567,34 @@ (define-public duc
(search-patches "duc-fix-test-sh.patch"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (substitute* "src/duc/cmd-ui.c"
- (("ncursesw/ncurses.h") "ncurses.h"))
- (substitute* "examples/index.cgi"
- (("/usr/local/bin/duc")
- (string-append out "/bin/duc"))))))
- (add-after 'install 'install-examples
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/" ,name "-" ,version)))
- (copy-recursively "examples" (string-append doc "/examples")))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (substitute* "test.sh"
- ;; Keep the test logs where --keep-failed can see them.
- (("^(DUC_TEST_DIR=).*" _ assign)
- (format #f "~a~a/test-directory~%" assign (getcwd)))
- ;; XXX ‘actual size’ differed on my system (a consistent 348160
- ;; bytes where the tests expect 540672). However, the ‘apparent
- ;; size’ matches, as does the actual test output. Good enough…?
- ((" [0-9]*B actual") " [0-9]*B actual"))
- (when tests?
- (invoke "./test.sh"))))))) ; no ‘check’ target
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* "src/duc/cmd-ui.c"
+ (("ncursesw/ncurses.h") "ncurses.h"))
+ (substitute* "examples/index.cgi"
+ (("/usr/local/bin/duc")
+ (string-append out "/bin/duc"))))))
+ (add-after 'install 'install-examples
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (string-append out "/share/doc/" #$name "-" #$version)))
+ (copy-recursively "examples" (string-append doc "/examples")))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (substitute* "test.sh"
+ ;; Keep the test logs where --keep-failed can see them.
+ (("^(DUC_TEST_DIR=).*" _ assign)
+ (format #f "~a~a/test-directory~%" assign (getcwd)))
+ ;; XXX ‘actual size’ differed on my system (a consistent 348160
+ ;; bytes where the tests expect 540672). However, the ‘apparent
+ ;; size’ matches, as does the actual test output. Good enough…?
+ ((" [0-9]*B actual") " [0-9]*B actual"))
+ (when tests?
+ (invoke "./test.sh"))))))) ; no ‘check’ target
(native-inputs
(list autoconf automake libtool pkg-config))
(inputs
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread