GNU Wdiff: Testsuite fails

GNU Wdiff: Testsuite fails

[Nikita Karetnikov]

[-- Attachment #1.1: Type: text/plain, Size: 232 bytes --]

I'm facing a similar problem [1] with GNU Wdiff.  'testsuite.at' just
calls 'wdiff.at'.  But 'wdiff.at' fails.  How can I fix this without
touching 'wdiff.at'?

[1] https://lists.gnu.org/archive/html/bug-guix/2013-02/msg00031.html


[-- Attachment #1.2: wdiff.scm --]
[-- Type: text/plain, Size: 2272 bytes --]

;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

(define-module (gnu packages wdiff)
  #:use-module (guix licenses)
  #:use-module (guix packages)
  #:use-module (guix download)
  #:use-module (guix build-system gnu)
  #:use-module (gnu packages base)
  #:use-module (gnu packages screen)
  #:use-module (gnu packages which))

(define-public wdiff
  (package
    (name "wdiff")
    (version "1.1.2")
    (source
     (origin
      (method url-fetch)
      (uri (string-append "mirror://gnu/wdiff/wdiff-"
                          version ".tar.gz"))
      (sha256
       (base32
        "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j"))))
    (build-system gnu-build-system)
    (inputs `(("diffutils" ,diffutils) ; XXX: Is it needed?
              ("screen" ,screen)
              ("which" ,which)))
    (home-page "https://www.gnu.org/software/wdiff/")
    (synopsis
     "GNU Wdiff, a tool for comparing files on a word by word basis")
    (description
     "GNU Wdiff is a front end to 'diff' for comparing files on a word per
word basis.  A word is anything between whitespace.  This is useful for
comparing two texts in which a few words have been changed and for which
paragraphs have been refilled.  It works by creating two temporary files, one
word per line, and then executes 'diff' on these files.  It collects the
'diff' output and uses it to produce a nicer display of word differences
between the original files.")
    (license gpl3+)))

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: GNU Wdiff: Testsuite fails

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> I'm facing a similar problem [1] with GNU Wdiff.  'testsuite.at' just
> calls 'wdiff.at'.  But 'wdiff.at' fails.  How can I fix this without
> touching 'wdiff.at'?

The .at files are not used when building from the tarball.  Roughly,
they’re just concatenated by ‘autoconf’ into a single script,
‘testsuite’.

So if you can patch ‘testsuite’ directly, that’s better.

Ludo’.

Re: GNU Wdiff: Testsuite fails

[Nikita Karetnikov]

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

> So if you can patch ‘testsuite’ directly, that’s better.

I guess that the following line raises the error:

( $at_check_trace; env PATH="$PWD" "$wdiff_bin" foo.txt bar.txt

'wdiff_bin' is defined like this:

wdiff_bin="`which wdiff`"

Why does it fail to find the binary?  Is it connected with 'env'?

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: GNU Wdiff: Testsuite fails

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> 'wdiff_bin' is defined like this:
>
> wdiff_bin="`which wdiff`"
>
> Why does it fail to find the binary?  Is it connected with 'env'?

You probably need to add ‘which’ as an input, no?

Ludo’.

Re: GNU Wdiff: Testsuite fails

[Nikita Karetnikov]

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

> You probably need to add ‘which’ as an input, no?

I've already tried [1].  (Check the recipe.)

[1] https://lists.gnu.org/archive/html/bug-guix/2013-02/msg00040.html

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: GNU Wdiff: Testsuite fails

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

>> You probably need to add ‘which’ as an input, no?
>
> I've already tried [1].  (Check the recipe.)
>
> [1] https://lists.gnu.org/archive/html/bug-guix/2013-02/msg00040.html

Can you send the actual test suite log?

If ‘which wdiff’ fails, then it could be because the test suite expects
wdiff to be installed and in $PATH before ‘make check’ is run (which
would be inelegant...)

Thanks,
Ludo’.

Re: GNU Wdiff: Testsuite fails

[Nikita Karetnikov]

[-- Attachment #1.1: Type: text/plain, Size: 77 bytes --]

> Can you send the actual test suite log?

I've attached the relevant part.


[-- Attachment #1.2: wdiff-testsuite.log --]
[-- Type: text/plain, Size: 1474 bytes --]

## ------------- ##
## Test results. ##
## ------------- ##

ERROR: 3 tests were run,
1 failed unexpectedly.
1 test was skipped.

## ------------------------ ##
## Summary of the failures. ##
## ------------------------ ##
Failed tests:
GNU wdiff 1.1.2 test suite: wdiff test groups:

 NUM: FILE-NAME:LINE     TEST-GROUP-NAME
      KEYWORDS

   2: wdiff.at:142       report bad diff binary

Skipped tests:
GNU wdiff 1.1.2 test suite: wdiff test groups:

 NUM: FILE-NAME:LINE     TEST-GROUP-NAME
      KEYWORDS

   3: wdiff.at:168       use pager

## ---------------------- ##
## Detailed failed tests. ##
## ---------------------- ##

#                             -*- compilation -*-
2. wdiff.at:142: testing report bad diff binary ...
./wdiff.at:154: env PATH="$PWD" "$wdiff_bin" foo.txt bar.txt
stderr:
/tmp/nix-build-wdiff-1.1.2.drv-12/wdiff-1.1.2/src/wdiff: failed to execute diff: No such file or directory
./wdiff.at:155: grep "wdiff: failed to execute diff" stderr
./wdiff.at:162: env PATH="$PWD" "$wdiff_bin" foo.txt bar.txt
--- -	2013-02-11 04:46:28.542989970 +0000
+++ /tmp/nix-build-wdiff-1.1.2.drv-12/wdiff-1.1.2/tests/testsuite.dir/at-groups/2/stderr	2013-02-11 04:46:28.000000000 +0000
@@ -1,2 +1,2 @@
-This diff is broken
+/tmp/nix-build-wdiff-1.1.2.drv-12/wdiff-1.1.2/src/wdiff: failed to execute diff: No such file or directory
 
2. wdiff.at:142: 2. report bad diff binary (wdiff.at:142): FAILED (wdiff.at:162)

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: GNU Wdiff: Testsuite fails

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> /tmp/nix-build-wdiff-1.1.2.drv-12/wdiff-1.1.2/src/wdiff: failed to execute diff: No such file or directory

So, the test suite creates ‘diff’ binaries, for instance, with an
invalid shebang.

To fix that you need to add a phase that does:

  (substitute* "tests/testsuite"
    (("#! /bin/sh")
     (string-append "#!" (which "sh"))))

I believe this should be enough.

HTH,
Ludo’.

[PATCH] gnu: Add GNU Wdiff. (was: GNU Wdiff: Testsuite fails)

[Nikita Karetnikov]

[-- Attachment #1.1: Type: text/plain, Size: 78 bytes --]

> I believe this should be enough.

Thanks, it worked.

Can I push this one?


[-- Attachment #1.2: 0001-gnu-Add-GNU-Wdiff.patch --]
[-- Type: text/x-diff, Size: 3606 bytes --]

From a9401ad161426d664779fa030b30616bb3c36058 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Mon, 11 Feb 2013 11:39:05 +0000
Subject: [PATCH] gnu: Add GNU Wdiff.

* gnu/packages/wdiff.scm: New file.
* Makefile.am (MODULES): Add it.
---
 Makefile.am            |    1 +
 gnu/packages/wdiff.scm |   61 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 gnu/packages/wdiff.scm

diff --git a/Makefile.am b/Makefile.am
index f9b64e7..bc41d86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,6 +144,7 @@ MODULES =					\
   gnu/packages/texlive.scm			\
   gnu/packages/time.scm				\
   gnu/packages/tor.scm				\
+  gnu/packages/wdiff.scm			\
   gnu/packages/wget.scm				\
   gnu/packages/which.scm			\
   gnu/packages/xml.scm				\
diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm
new file mode 100644
index 0000000..02d536c
--- /dev/null
+++ b/gnu/packages/wdiff.scm
@@ -0,0 +1,61 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages wdiff)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages screen)
+  #:use-module (gnu packages which))
+
+(define-public wdiff
+  (package
+    (name "wdiff")
+    (version "1.1.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/wdiff/wdiff-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (alist-cons-before
+                 'check 'fix-sh
+                 (lambda _
+                   (substitute* "tests/testsuite"
+                     (("#! /bin/sh")
+                      (string-append "#!" (which "sh")))))
+                 %standard-phases)))
+    (inputs `(("screen" ,screen)
+              ("which" ,which)))
+    (home-page "https://www.gnu.org/software/wdiff/")
+    (synopsis
+     "GNU Wdiff, a tool for comparing files on a word by word basis")
+    (description
+     "GNU Wdiff is a front end to 'diff' for comparing files on a word per
+word basis.  A word is anything between whitespace.  This is useful for
+comparing two texts in which a few words have been changed and for which
+paragraphs have been refilled.  It works by creating two temporary files, one
+word per line, and then executes 'diff' on these files.  It collects the
+'diff' output and uses it to produce a nicer display of word differences
+between the original files.")
+    (license gpl3+)))
\ No newline at end of file
-- 
1.7.5.4


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: [PATCH] gnu: Add GNU Wdiff.

[Ludovic Courtès]

Nikita Karetnikov <nikita@karetnikov.org> skribis:

> Can I push this one?

Yes, please.

Ludo’.