[PATCH 1/2] gnu: Enable swig tests.

[PATCH 1/2] gnu: Enable swig tests.

[John Darrington]

* gnu/packages/swig.scm (swig): Add boost as input and enable tests.
---
 gnu/packages/swig.scm |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index 3554803..7f7d319 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -23,6 +23,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages python)
   #:use-module (gnu packages perl)
   #:export (swig))
@@ -39,11 +40,7 @@
               (base32
                "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33"))))
     (build-system gnu-build-system)
-    (arguments '(#:configure-flags '("--without-boost")
-
-                 ;; FIXME: Some tests require Boost anyway.  Turn them on when
-                 ;; we have Boost.
-                 #:tests? #f))
+    (native-inputs `(("boost" ,boost)))
     (inputs `(("pcre" ,pcre)
 
               ;; Provide these to run the corresponding tests.
-- 
1.7.10.4

[PATCH 2/2] gnu: Enable tests for patch.

[John Darrington]

* gnu/packages/base.scm (patch): Enable test and add "ed" as input.
---
 gnu/packages/base.scm |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c280cff..005e1c0 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -28,6 +28,7 @@
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages ed)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages multiprecision)
@@ -164,12 +165,9 @@ standard utility.")
              (base32
               "1sqckf560pzwgniy00vcpdv2c9c11s4cmhlm14yqgg8avd3bl94i"))))
    (build-system gnu-build-system)
-   (native-inputs '())                      ; FIXME: needs `ed' for the tests
-   (arguments
-    '(#:tests? #f)
+   (native-inputs `(("ed", ed)))
     ;; TODO: When cross-compiling, add this:
     ;;  '(#:configure-flags '("ac_cv_func_strnlen_working=yes"))
-    )
    (synopsis "Apply differences to originals, with optional backups")
    (description
     "Patch is a program that applies changes to files based on differences
-- 
1.7.10.4

Re: [PATCH 1/2] gnu: Enable swig tests.

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/swig.scm (swig): Add boost as input and enable tests.

OK to commit.

Ludo’.

Re: [PATCH 2/2] gnu: Enable tests for patch.

[Ludovic Courtès]

John Darrington <jmd@gnu.org> skribis:

> * gnu/packages/base.scm (patch): Enable test and add "ed" as input.

OK but *only* for the core-updates branch.  Can you create it?

Before committing, please make sure that bootstrapping still works, for
instance by building:

  ./pre-inst-env guix build \
    -e '(@@ (gnu packages base) glibc-final-with-bootstrap-bash)'

That should build ‘patch’ at least once IIRC.

Thanks,
Ludo’.