Re: `make check` fails in VPATH build

Thien-Thi Nguyen <[email protected]> Mon, 21 Oct 2013 15:04:37 +0200
Newsgroups gmane.network.serveez.bugs
Message-ID <[email protected]>
--===============3949996069768633588==
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain

() Thien-Thi Nguyen <[email protected]>
() Sun, 20 Oct 2013 18:18:11 +0200

   will post a patch shortly.

Here is a patch that you can apply against the 0.2.1 tarball:

--=-=-=
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: inline; filename=the.diff
Content-Transfer-Encoding: quoted-printable

diff -urbw old/ new
diff -urbw old/test/Makefile.am new/test/Makefile.am
=2D-- old/test/Makefile.am	2013-03-06 09:13:50.000000000 +0100
+++ new/test/Makefile.am	2013-10-21 14:47:39.000000000 +0200
@@ -26,7 +26,9 @@
 # FIXME: Make =E2=80=98SVZ_GUILE=E2=80=99 (../configure.ac) set this.
 GUILE =3D guile
=20
=2DTESTS_ENVIRONMENT =3D $(GUILE) -s
+TESTS_ENVIRONMENT =3D					\
+	GUILE_LOAD_PATH=3D".:$(srcdir):$$GUILE_LOAD_PATH"	\
+	$(GUILE) -s
 XFAIL_TESTS =3D
 TESTS =3D t000 t001 t002 t003 t004 t005 t006 t007
=20
diff -urbw old/test/Makefile.in new/test/Makefile.in
=2D-- old/test/Makefile.in	2013-03-24 01:01:09.000000000 +0100
+++ new/test/Makefile.in	2013-10-21 14:47:45.000000000 +0200
@@ -334,7 +334,9 @@
=20
 # FIXME: Make =E2=80=98SVZ_GUILE=E2=80=99 (../configure.ac) set this.
 GUILE =3D guile
=2DTESTS_ENVIRONMENT =3D $(GUILE) -s
+TESTS_ENVIRONMENT =3D					\
+	GUILE_LOAD_PATH=3D".:$(srcdir):$$GUILE_LOAD_PATH"	\
+	$(GUILE) -s
 TESTS =3D t000 t001 t002 t003 t004 t005 t006 t007
 EXTRA_DIST =3D common $(TESTS) \
 	test-suite.scm
Solo in new/test: Makefile.in~
diff -urbw old/test/t001 new/test/t001
=2D-- old/test/t001	2013-01-20 15:49:50.000000000 +0100
+++ new/test/t001	2013-10-21 14:45:56.000000000 +0200
@@ -18,11 +18,11 @@
 ;;; Code:
=20
 ;; Skip this test if the passthrough server is not enabled.
=2D(primitive-load "but-of-course")
+(primitive-load-path "but-of-course")
 (or (boc? 'ENABLE_PROG_SERVER)
     (exit 77))
=20
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "common")
 (set! TESTBASE "t001")
=20
 (write-config!
diff -urbw old/test/t002 new/test/t002
=2D-- old/test/t002	2013-01-20 15:49:50.000000000 +0100
+++ new/test/t002	2013-10-21 14:45:56.000000000 +0200
@@ -18,13 +18,13 @@
 ;;; Code:
=20
 ;; Skip this test if the SNTP server is not enabled.
=2D(primitive-load "but-of-course")
+(primitive-load-path "but-of-course")
 (or (boc? 'ENABLE_SNTP_PROTO)
     (exit 77))
 (define EXPECT-8? (and-map boc? '(HAVE_DECL_GETTIMEOFDAY
                                   HAVE_SYS_TIME_H)))
=20
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "common")
 (set! TESTBASE "t002")
=20
 (define UNIX-EPOCH-OFFSET 2208988800)   ; per RFC 868
diff -urbw old/test/t003 new/test/t003
=2D-- old/test/t003	2013-03-20 12:25:25.000000000 +0100
+++ new/test/t003	2013-10-21 14:45:56.000000000 +0200
@@ -19,11 +19,11 @@
 ;;; Code:
=20
 ;; Skip this test if the Guile server is not enabled.
=2D(primitive-load "but-of-course")
+(primitive-load-path "but-of-course")
 (or (boc? 'ENABLE_GUILE_SERVER)
     (exit 77))
=20
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "common")
 (set! TESTBASE "t003")
=20
 (write-config!
diff -urbw old/test/t004 new/test/t004
=2D-- old/test/t004	2013-02-26 09:32:21.000000000 +0100
+++ new/test/t004	2013-10-21 14:45:56.000000000 +0200
@@ -18,11 +18,11 @@
 ;;; Code:
=20
 ;; Skip this test if the HTTP server is not enabled.
=2D(primitive-load "but-of-course")
+(primitive-load-path "but-of-course")
 (or (boc? 'ENABLE_HTTP_PROTO)
     (exit 77))
=20
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "common")
 (set! TESTBASE "t004")
=20
 (define SCRIPT-NAME (string-append TESTBASE ".cgi"))
diff -urbw old/test/t005 new/test/t005
=2D-- old/test/t005	2013-03-11 14:07:33.000000000 +0100
+++ new/test/t005	2013-10-21 14:45:56.000000000 +0200
@@ -18,7 +18,7 @@
=20
 ;;; Code:
=20
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "common")
 (set! TESTBASE "t005")
=20
 (write-config!
diff -urbw old/test/t006 new/test/t006
=2D-- old/test/t006	2013-03-11 14:08:03.000000000 +0100
+++ new/test/t006	2013-10-21 14:45:56.000000000 +0200
@@ -18,8 +18,8 @@
=20
 ;;; Code:
=20
=2D(primitive-load "but-of-course")
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "but-of-course")
+(primitive-load-path "common")
 (set! TESTBASE "t006")
=20
 (push-dot-on-load-path!)
diff -urbw old/test/t007 new/test/t007
=2D-- old/test/t007	2013-03-06 09:13:28.000000000 +0100
+++ new/test/t007	2013-10-21 14:45:56.000000000 +0200
@@ -21,8 +21,8 @@
  (ice-9 rdelim)
  (srfi srfi-13))
=20
=2D(primitive-load "but-of-course")
=2D(load (in-vicinity (getenv "srcdir") "common"))
+(primitive-load-path "but-of-course")
+(primitive-load-path "common")
 (set! TESTBASE "t007")
=20
 (push-dot-on-load-path!)

Diff finished.  Mon Oct 21 14:49:34 2013

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable


It is a subset of the change just installed:

 http://git.savannah.gnu.org/cgit/serveez.git/commit/?h=3Dp&id=3D9ae8faefc2

(the full change includes modifications to test/t008, which is not in
0.2.1).  When you apply it, be sure to touch test/Makefile.in afterwards
(prior to running "make check") to thwart any "automagic" Makefile.am to
Makefile.in rebuild weirdness.  (In theory it should only come into play
if you =E2=80=98./configure --enable-maintainer-mode=E2=80=99, but you neve=
r know...)

Does that help?

=2D-=20
Thien-Thi Nguyen
   GPG key: 4C807502
   (if you're human and you know it)
      read my lisp: (responsep (questions 'technical)
                               (not (via 'mailing-list)))
                     =3D> nil

--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAlJlJmcACgkQZwMiJEyAdQICngCeNgzYimPjbZbVcGAI85Lhn59d
fvEAn24NdnfRMEiyYTrVtjEknvolG+sA
=wXzj
-----END PGP SIGNATURE-----
--==-=-=--


--===============3949996069768633588==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
bug-serveez mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/bug-serveez

--===============3949996069768633588==--