From 1a3aa5bab2f9ceb657c862017af62fa295834f98 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 02:54:53 -0400 Subject: 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(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 628c39a6eb..d34c14d376 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,12 +227,11 @@ (define-public libarchive ;; 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"))) -- cgit v1.2.3