From 94f52fe26898e6d476630dca746531f7cbe8b882 Mon Sep 17 00:00:00 2001
From: Leo Famulari <address@hidden>
Date: Tue, 6 Sep 2016 03:21:45 -0400
Subject: [PATCH] gnu: qemu-2.3.0, qemu-for-tests: Fix path.

This is a followup to commit 43bec6d06d8dcc4c0f865e492d370a8724bba2ce.

* gnu/packages/grub.scm (qemu-for-tests)[arguments]: Replace 'disable-test-qga'
phase.
* gnu/packages/debug.scm (qemu-2.3.0)[arguments]: Likewise.
---
 gnu/packages/debug.scm | 11 ++++++++++-
 gnu/packages/grub.scm  | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 9da8885..6bcb0f1 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -161,7 +161,16 @@ 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)
+            `(modify-phases ,phases
+               ;; The filename changed in address@hidden
+               (replace 'disable-test-qga
+                 (lambda _
+                   (substitute* "tests/Makefile"
+                     (("check-unit-.* tests/test-qga" all)
+                      (string-append "# " all)))
+                   #t)))))))))
 
 (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..298379d 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -24,6 +24,7 @@
   #:use-module (guix packages)
   #:use-module ((guix licenses) #:select (gpl3+))
   #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages disk)
@@ -58,7 +59,16 @@
     ;;   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)
+                      `(modify-phases ,phases
+                         ;; The filename changed in address@hidden
+                         (replace 'disable-test-qga
+                           (lambda _
+                             (substitute* "tests/Makefile"
+                               (("check-unit-.* tests/test-qga" all)
+                                (string-append "# " all)))
+                             #t)))))))
 
     ;; The manual fails to build with Texinfo 5.x.
     (native-inputs (alist-delete "texinfo" (package-native-inputs qemu)))))
-- 
2.10.0