|
 |
6ae9ed |
From 380bb5119e8ec08d79123c2323b6fcf59194b31d Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <380bb5119e8ec08d79123c2323b6fcf59194b31d@dist-git>
|
|
|
6ae9ed |
From: John Ferlan <jferlan@redhat.com>
|
|
|
6ae9ed |
Date: Fri, 5 Aug 2016 16:10:10 +0200
|
|
|
6ae9ed |
Subject: [PATCH] tests: Fix broken build
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1304483
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Commit id 'f522b7d2' caused a build failure :
|
|
|
6ae9ed |
|
|
|
6ae9ed |
GEN check-augeas-virtlogd
|
|
|
6ae9ed |
Test failure:test_libvirtd_qemu.aug:69.3-147.28:
|
|
|
6ae9ed |
Expected:
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
...
|
|
|
6ae9ed |
{ "nvram"
|
|
|
6ae9ed |
{ "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
6ae9ed |
{ "2" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
...
|
|
|
6ae9ed |
Actual:
|
|
|
6ae9ed |
...
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
{ "nvram"
|
|
|
6ae9ed |
{ "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
6ae9ed |
{ "2" = "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
6ae9ed |
{ "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
...
|
|
|
6ae9ed |
|
|
|
6ae9ed |
This patch adds the OVMF_CODE.secboot.fd to the aug.in file
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit d5813d72ad2bd8f9735b96bafe2ba350f74b3994)
|
|
|
6ae9ed |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/test_libvirtd_qemu.aug.in | 3 ++-
|
|
|
6ae9ed |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
6ae9ed |
index c4d4f19..99bf90f 100644
|
|
|
6ae9ed |
--- a/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
6ae9ed |
+++ b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
6ae9ed |
@@ -77,6 +77,7 @@ module Test_libvirtd_qemu =
|
|
|
6ae9ed |
{ "log_timestamp" = "0" }
|
|
|
6ae9ed |
{ "nvram"
|
|
|
6ae9ed |
{ "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
6ae9ed |
- { "2" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
|
|
|
6ae9ed |
+ { "2" = "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
6ae9ed |
+ { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
{ "stdio_handler" = "logd" }
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|