mhw pushed a commit to branch core-updates
in repository guix.
commit 1a3aa5bab2f9ceb657c862017af62fa295834f98
Author: Mark H Weaver <[email protected]>
Date: Fri Mar 23 02:54:53 2018 -0400
gnu: libarchive: Use invoke.
* gnu/packages/backup.scm (libarchive)[arguments]: Use invoke and remove
vestigial plumbing from the check phase.
---
gnu/packages/backup.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 628c39a..d34c14d 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2017 Efraim Flashner <[email protected]>
;;; Copyright © 2017 Christopher Allan Webber <[email protected]>
;;; Copyright © 2017 Rutger Helling <[email protected]>
+;;; Copyright © 2018 Mark H Weaver <[email protected]>
;;;
;;; 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 tests allow one to disable tests matching a globbing
pattern.
- (and (zero? (system* "make"
- "libarchive_test" "bsdcpio_test"
"bsdtar_test"))
- ;; XXX: This glob disables too much.
- (zero? (system* "./libarchive_test" "^test_*_disk*"))
- (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
- (zero? (system* "./bsdtar_test"))))))
+ (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test")
+ ;; XXX: This glob disables too much.
+ (invoke "./libarchive_test" "^test_*_disk*")
+ (invoke "./bsdcpio_test" "^test_owner_parse")
+ (invoke "./bsdtar_test"))))
;; libarchive/test/test_write_format_gnutar_filenames.c needs to be
;; compiled with C99 or C11 or a gnu variant.
#:configure-flags '("CFLAGS=-O2 -g -std=c99")))
