nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libarchive: Use invoke. 

* gnu/packages/backup.scm (libarchive)[arguments]: Use invoke and remove
vestigial plumbing from the check phase.
master
Mark H Weaver 2018-03-23 02:54:53 -04:00
parent 859e8873d0
commit 1a3aa5bab2
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/backup.scm
View File

@ -9,6 +9,7 @@
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -226,12 +227,11 @@ backups (called chunks) to allow easy burning to CD/DVD.")
;; the chroot's /etc/passwd doesn't have it. Turn off those tests. ;; the chroot's /etc/passwd doesn't have it. Turn off those tests.
;; ;;
;; The tests allow one to disable tests matching a globbing pattern. ;; The tests allow one to disable tests matching a globbing pattern.
(and (zero? (system* "make" (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test")
"libarchive_test" "bsdcpio_test" "bsdtar_test")) ;; XXX: This glob disables too much.
;; XXX: This glob disables too much. (invoke "./libarchive_test" "^test_*_disk*")
(zero? (system* "./libarchive_test" "^test_*_disk*")) (invoke "./bsdcpio_test" "^test_owner_parse")
(zero? (system* "./bsdcpio_test" "^test_owner_parse")) (invoke "./bsdtar_test"))))
(zero? (system* "./bsdtar_test"))))))
;; libarchive/test/test_write_format_gnutar_filenames.c needs to be ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be
;; compiled with C99 or C11 or a gnu variant. ;; compiled with C99 or C11 or a gnu variant.
#:configure-flags '("CFLAGS=-O2 -g -std=c99"))) #:configure-flags '("CFLAGS=-O2 -g -std=c99")))