Re: hydra and t632

--MfFXiAuoTsnnDAfZ
Content-Type: multipart/mixed; boundary="W/nzBZO5zC0uMSeA"
Content-Disposition: inline


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

On Thu, Oct 22, 2020 at 04:17:31AM -0400, Thien-Thi Nguyen wrote:
> () Efraim Flashner <[email protected]>
> () Thu, 22 Oct 2020 10:47:04 +0300
>=20
>    (system* (which "tty"))
>    not a tty
>=20
> That looks fishy.  I see, instead:
>=20
>  $ which guile
>  /usr/bin/guile
> =20
>  $ guile
>  GNU Guile 2.0.13
>  [...]
>  scheme@(guile-user)> (system "/usr/bin/tty")
>  /dev/pts/6
>  $1 =3D 0
>  scheme@(guile-user)> (quit)
>=20
> How is your chroot environment set up?  You mentioned previously
> that something was bind-mounted?  What does that mean precisely?
>=20

The code is pretty much straight from Nix, from a snapshot back in 2014.
https://git.savannah.gnu.org/cgit/guix.git/tree/nix/libstore/build.cc#n2019
The package definition for rcs is here:
https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/version-contro=
l.scm#n1799
the commands are run inside the build chroot. When I ran the commands I
set them up to make sure they ran during the build.



--=20
Efraim Flashner   <[email protected]>   =D7=90=D7=A4=D7=A8=D7=99=D7=9D =
=D7=A4=D7=9C=D7=A9=D7=A0=D7=A8
GPG key =3D A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

--W/nzBZO5zC0uMSeA
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="rcs.patch"

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index fe61bc8fce..3e77548127 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1799,26 +1799,46 @@ projects, from individuals to large-scale enterprise operations.")
 (define-public rcs
   (package
     (name "rcs")
-    (version "5.9.4")
+    (version "5.10.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/rcs/rcs-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"))
-             (patches (search-patches "rcs-5.9.4-noreturn.patch"))))
+               "1if5pa4iip2p70gljm54nggfdnsfjxa4cqz8fpj07lvsijary39s"))
+             ;(patches (search-patches "rcs-5.9.4-noreturn.patch"))
+             ))
     (build-system gnu-build-system)
     (native-inputs `(("ed" ,ed)))
+    (inputs `(("time" ,(@ (gnu packages time) time))))
     (arguments
      `(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'disable-t810
-                    ;; See https://savannah.gnu.org/bugs/index.php?52288
-                    ;; Back-porting the fix is non-trivial, so disable for now.
+                  (add-before 'check 'test-t632-debugging
                     (lambda _
-                      (substitute* "tests/Makefile"
-                        ((" t810 \\\\\n") ""))
-                     #t)))))
+                      (substitute* "tests/t632"
+                        (("timeout --foreground 0\\.42s")
+                         ;"timeout --foreground 50s") ;a
+                         ;"timeout 50s") ;b
+                         ;"LANG=C timeout --foreground 50s") ;c
+                         ;"LANG=C timeout") ;d
+                         "")
+                        ;(("timeout") (which "timeout"))
+                        )
+                      (invoke "grep" "timeout" "tests/t632")
+                     #t))
+                  (replace 'check
+                    (lambda _
+                      (with-directory-excursion "tests"
+                        (system* "time" "make" "check" "KEEPD=1" "VERBOSE=1" "TESTS=t632")
+                        (invoke "cat" "t632.d/signal-handling-out-and-err")
+                        (display (which "tty"))
+                        (newline)
+                        (system* (which "tty"))
+                        (system* "ls" "-la" (which "tty"))
+                        #f
+                        )))
+                  )))
     (home-page "https://www.gnu.org/software/rcs/")
     (synopsis "Per-file local revision control system")
     (description

--W/nzBZO5zC0uMSeA--

--MfFXiAuoTsnnDAfZ
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl+RWDcACgkQQarn3Mo9
g1FnIg/9G4DsYr2YG4WNQfd8ve1siYdRRyJIbQG5qRfto6WTXmzi5FOO9rYf4kaA
ZhFJE/DWc9shurIsjgmQvECBlq2hxFicBq59JRhqstEVcM5dD+yXqSPqCXZPwzzn
u2pytJIRy1Wc3BD8WvaoFlcjH+CdaGS6r5vCySjmp8iJFehrBrJIu6skDSiVVcJq
Kou6QEGRfxZUR2v5SSUTKQAqLsCZu3uD93DFOQMnm7cRM7CWm85OXinOMCMoQRN+
4+Ec4kcZ6niwS77rCeljgEIngEoqVgjiDdFCiCGQ26Fpxgwesg6M4RUd8UbkZQAY
E3gn9qhav+Nvlf0JPtqnZ7gD4iiY0iP6FhMuMbMkRBpW36sGE3eEjTAi70wHYaoV
tPA10iV9tYk/dw3L1PaMFqsdkz9Hkl8m7vdHmVhltRnVHk2mHlR1txmnjRMzLegn
DLHqinwsy2yJjnxwzaxWzDCPo66zqKai8jPY8HRAFSiKSi/aErMfic/mwi1yZm96
hUIxbo6OcU8vL5sMtAzK/k70Jp1nZswSXQF+8NDIdN0P0rNIPV1J1roEKiCMXc/2
behw4nj6QOAh101rTI+6nHSIzQmqnqx4mfzENa4VH4UsMX2syTS3DppGgTTn68NV
QtfcOHZTjn4V9kSSXWSYseHD4rWGhmrrVzNl6RegtS8LSFFVmog=
=idML
-----END PGP SIGNATURE-----

--MfFXiAuoTsnnDAfZ--