Re: [bug-serveez] serveez-0.2.2 in Guix, was "`make check` fails in VPATH build"

[Eric Bavier]

Thien-Thi Nguyen <address@hidden> writes:

> I see in the resulting package description that you need to
> substitute "/bin/sh" w/ the output of ‘(which "sh")’.  At "make check"
> time, could you use the env var ‘SHELL’ (or ‘CHECKSHELL’), instead?

Maybe test/Makefile.am could put SHELL into the test environment?

--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -27,6 +27,7 @@
 GUILE = guile
 
 TESTS_ENVIRONMENT =                                    \
+       SHELL=$(SHELL)                                  \
        GUILE_LOAD_PATH=".:$(srcdir):$$GUILE_LOAD_PATH" \
        $(GUILE) -s
 XFAIL_TESTS =

And then have t004 use it

--- a/test/t004
+++ b/test/t004
@@ -72,7 +72,7 @@
   (lambda ()
     (for-each (lambda (line)
                 (fso "~A~%" line))
-              '("#!/bin/sh"
+              '((string-append "#!" (getenv "SHELL"))
                 "exec ${GUILE-guile} -s $0 ;# -*- scheme -*-"
                 "!#"))
     (for-each write SCRIPT-BODY)

> If so, i can change that in the source, to reduce the patching required
> for Guix.  (Generally, i am happy to accomodate changes to reduce
> patching, if they are easy to implement and do not break things for
> other systems.)

Thank you very much.

-- 
`~Eric