06/06: gnu: Fix pre-2.7.0 qemu builds.

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 83723949a4e5f90176f8863dd08fd9c7f36bce75
Author: Efraim Flashner <address@hidden>
Date:   Tue Sep 6 15:53:57 2016 +0300

    gnu: Fix pre-2.7.0 qemu builds.
    
    This is a follow-up to 43bec6d0.
    
    * gnu/packages/debug.scm (qemu-2.3.0),
    gnu/packages/grub.scm (qemu-for-tests)[arguments]: Remove the
    'disable-test-qga phase.
---
 gnu/packages/debug.scm |    5 ++++-
 gnu/packages/grub.scm  |    8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 9da8885..82a8090 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -161,7 +161,10 @@ tools that process C/C++ code.")
      ;; XXX: Disable tests because of GTester's rejection of duplicate test
      ;; names, which wasn't addressed in this version of QEMU.
      `(#:tests? #f
-       ,@(package-arguments qemu-minimal)))))
+       ,@(substitute-keyword-arguments (package-arguments qemu-minimal)
+           ((#:phases phases)
+            ;; We disable the tests so we skip the phase disabling the qga 
test.
+            `(modify-phases ,phases (delete 'disable-test-qga))))))))
 
 (define-public american-fuzzy-lop
   (let ((machine (match (or (%current-target-system)
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 3229b86..302fd0e 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -22,6 +22,7 @@
 (define-module (gnu packages grub)
   #:use-module (guix download)
   #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module ((guix licenses) #:select (gpl3+))
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
@@ -58,7 +59,12 @@
     ;;   ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s) 
<= wiggle): (382597824 <= 2)
     ;; Simply disable the tests.
     (arguments `(#:tests? #f
-                 ,@(package-arguments qemu-minimal)))
+                 ,@(substitute-keyword-arguments (package-arguments 
qemu-minimal)
+                     ((#:phases phases)
+                      ;; We disable the tests so we also skip the phase 
disabling
+                      ;; the qga test, which fails due to changes in QEMU
+                      `(modify-phases ,phases
+                         (delete 'disable-test-qga))))))
 
     ;; The manual fails to build with Texinfo 5.x.
     (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))