From 2d690732458378edf1ee7a0eaefe922566d85026 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 8 Jul 2021 12:50:39 -0400 Subject: gnu: proot: Make the check phase honor the tests? argument. * gnu/packages/linux.scm: Remove duplicate copyright line. (proot): Delete trailing #t. [phases]{check}: Skip when TESTS? is #f. --- gnu/packages/linux.scm | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a7a82786e2..645b282ccf 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2019 Tim Gesthuizen -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire @@ -47,7 +47,6 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Anders Thuné -;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2020 David Dashyan @@ -6825,7 +6824,6 @@ userspace queueing component and the logging subsystem.") (build-system gnu-build-system) (arguments '(#:make-flags '("-C" "src") - #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'build 'set-shell-file-name @@ -6834,8 +6832,7 @@ userspace queueing component and the logging subsystem.") (("\"/bin/sh\"") (string-append "\"" (assoc-ref inputs "bash") - "/bin/sh\""))) - #t)) + "/bin/sh\""))))) (add-before 'check 'fix-fhs-assumptions-in-tests (lambda _ (substitute* "tests/test-c6b77b77.mk" @@ -6861,24 +6858,23 @@ userspace queueing component and the logging subsystem.") ;; XXX: This test fails in an obscure corner case, just ;; skip it. - (delete-file "tests/test-kkkkkkkk.c") - - #t)) + (delete-file "tests/test-kkkkkkkk.c"))) (replace 'check - (lambda _ - (let ((n (parallel-job-count))) - ;; For some reason we get lots of segfaults with - ;; seccomp support (x86_64, Linux-libre 4.11.0). - (setenv "PROOT_NO_SECCOMP" "1") - - ;; Most of the tests expect "/bin" to be in $PATH so - ;; they can run things that live in $ROOTFS/bin. - (setenv "PATH" - (string-append (getenv "PATH") ":/bin")) - - (invoke "make" "check" "-C" "tests" - ;;"V=1" - "-j" (number->string n))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (let ((n (parallel-job-count))) + ;; For some reason we get lots of segfaults with + ;; seccomp support (x86_64, Linux-libre 4.11.0). + (setenv "PROOT_NO_SECCOMP" "1") + + ;; Most of the tests expect "/bin" to be in $PATH so + ;; they can run things that live in $ROOTFS/bin. + (setenv "PATH" + (string-append (getenv "PATH") ":/bin")) + + (invoke "make" "check" "-C" "tests" + ;;"V=1" + "-j" (number->string n)))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; The 'install' rule does nearly nothing. @@ -6891,8 +6887,7 @@ userspace queueing component and the logging subsystem.") (mkdir-p man1) (copy-file "doc/proot/man.1" - (string-append man1 "/proot.1")) - #t)))))) + (string-append man1 "/proot.1")))))))) (native-inputs `(("which" ,which) ;; For 'mcookie', used by some of the tests. -- cgit v1.2.3 version numbers....This provides the ability to use numbers in package names. Fixes <http://bugs.gnu.org/19219>. * guix/utils.scm (package-name->name+version): New procedure. * gnu/packages.scm (%find-package): Add a FALLBACK? keyword argument. Use the previous method when no package is found. (specification->package+output, specification->package): Adapt documentation to new syntax. * doc/guix.texi (Invoking guix package, Invoking guix import): Likewise. * guix/ui.scm (package-specification->name+version+output): Likewise. * guix/scripts/import/hackage.scm (show-help): Likewise. * tests/guix-build.sh: Adapt to new syntax. * tests/guix-lint.sh: Likewise. * tests/guix-package.sh: Likewise. * tests/ui.scm ("package-specification->name+version+output"): Likewise. * tests/utils.scm ("package-name->name+version"): Likewise. * NEWS: Mention new syntax. Mathieu Lirzin 2015-09-24ui: Gracefully handle Unicode description strings....Fixes <http://bugs.gnu.org/21536>. Reported by Alex Kost <alezost@gmail.com>. * guix/ui.scm (texi->plain-text): Wrap body in 'with-fluids'. * tests/ui.scm ("package-description-string vs. Unicode"): New test. Ludovic Courtès 2015-09-18Add (guix scripts)....* guix/ui.scm: Add missing copyright lines. (args-fold*, environment-build-options, %default-argument-handler, parse-command-line): Move to ... * guix/scripts.scm: ...here. New file. * guix/scripts/archive.scm: Use it. * guix/scripts/build.scm: Likewise. * guix/scripts/download.scm: Likewise. * guix/scripts/edit.scm: Likewise. * guix/scripts/environment.scm: Likewise. * guix/scripts/gc.scm: Likewise. * guix/scripts/graph.scm: Likewise. * guix/scripts/hash.scm: Likewise. * guix/scripts/import/cpan.scm: Likewise. * guix/scripts/import/cran.scm: Likewise. * guix/scripts/import/elpa.scm: Likewise. * guix/scripts/import/gem.scm: Likewise. * guix/scripts/import/gnu.scm: Likewise. * guix/scripts/import/hackage.scm: Likewise. * guix/scripts/import/nix.scm: Likewise. * guix/scripts/import/pypi.scm: Likewise. * guix/scripts/lint.scm: Likewise. * guix/scripts/package.scm: Likewise. * guix/scripts/publish.scm: Likewise. * guix/scripts/pull.scm: Likewise. * guix/scripts/refresh.scm: Likewise. * guix/scripts/size.scm: Likewise. * guix/scripts/system.scm: Likewise. * tests/ui.scm (with-environment-variable, "parse-command-line", "parse-command-line and --no options"): Move to ... * tests/scripts.scm: ...here. New file. * Makefile.am (MODULES): Add guix/scripts.scm. (SCM_TESTS): Add tests/scripts.scm. * po/guix/POTFILES.in: Add guix/scripts.scm. Alex Kost