Fix , which affects GNU/Hurd. diff --git a/libguile/posix.c b/libguile/posix.c index 3a8be94e4..f5fdc544c 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -1326,7 +1326,14 @@ static void close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) { while (--max_fd > 2) - posix_spawn_file_actions_addclose (actions, max_fd); + { + /* Adding invalid file descriptors to an 'addclose' action leads + to 'posix_spawn' failures on some operating systems: + . Hence the extra check. */ + int flags = fcntl (max_fd, F_GETFD, NULL); + if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) + posix_spawn_file_actions_addclose (actions, max_fd); + } } static void Fix . diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test index f20e04453..d5cf47cda 100644 --- a/test-suite/tests/posix.test +++ b/test-suite/tests/posix.test @@ -431,7 +431,13 @@ (let ((str (get-string-all (car input+output)))) (close-port (car input+output)) (waitpid pid) - str))) + + ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for + ;; every program: . Strip it. + (if (and (string=? "GNU" (utsname:sysname (uname))) + (string-prefix? "LD_ORIGIN_PATH=" str)) + (string-drop str (+ 1 (string-index str #\newline))) + str)))) (pass-if-equal "ls /proc/self/fd" "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd ild-aux/hydra/evaluate.scm'>
path: root/build-aux/hydra/evaluate.scm
AgeCommit message (Expand)Author
2020-03-22Remove workaround for 'time-monotonic' in Guile 2.2.2....This is a followup to e688c2df3924423b67892cc9939ca099c729d1cb. * build-aux/hydra/evaluate.scm <top level>: Remove 'time-monotonic' definition. * guix/cache.scm: Likewise. * guix/progress.scm: Likewise. * guix/scripts/substitute.scm: Likewise. * guix/scripts/weather.scm: Likewise. * tests/cache.scm: Likewise. Ludovic Courtès
2020-03-22hydra: evaluate: Use 'with-build-handler'....* build-aux/hydra/evaluate.scm (command-line): Remove 'set!' for 'build-things'. Use 'with-build-handler' instead. * build-aux/hydra/gnu-system.scm (hydra-jobs): Add comment about removing 'show-what-to-build' call. Ludovic Courtès
2019-01-06hydra: evaluate: Add the checkout to the store....* build-aux/hydra/evaluate.scm <top level>: Add call to 'add-to-store'. Use that as the 'file-name' attribute. Call 'primitive-load' in a directory excursion to SOURCE. Ludovic Courtès
2018-04-08hydra: 'guix-modular' jobs use the new 'build-self'....* build-aux/hydra/guix-modular.scm: Remove 'eval-when' form that fiddled with '%load-path'. (build-job): Load 'build-aux/build-self.scm' and call the procedure it returns. * build-aux/hydra/evaluate.scm: The 'build-things' replacement no longer calls 'exit'. Ludovic Courtès
2017-11-21hydra: 'evaluate' passes an alist to the entry point....* build-aux/hydra/evaluate.scm (%top-srcdir): New variable. <top level>: Pass it to 'hydra-jobs'. Ludovic Courtès
2017-09-28cuirass: Add 'cuirass-jobs.scm' target to compute the Cuirass jobs....* build-aux/hydra/evaluate.scm: Support "cuirass" command line option. * Makefile.am (cuirass-jobs.scm): New target. Jan Nieuwenhuizen
2017-05-07maint: Add 'time-monotonic' bug workaround in build-aux/hydra/evaluate.scm....* build-aux/hydra/evaluate.scm: Add 'time-monotonic' workaround for Guile 2.2. Ludovic Courtès