From 2ab9ebc96814d93b19eb53cda4de1ecea45ef860 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 31 Jul 2017 15:09:09 +0100
Subject: [PATCH] Add upstream patch which fixes ldoms test.

---
 ...ning-Amazon-Web-Services-cloud-guest.patch |  4 +-
 ...oms-test-so-it-doesn-t-test-the-host.patch | 57 +++++++++++++++++++
 virt-what.spec                                |  7 +++
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch

diff --git a/0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch b/0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch
index e78951d..5655098 100644
--- a/0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch
+++ b/0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch
@@ -1,8 +1,8 @@
 From d37de7dd898538137998a28bda2a6d1e63e747b8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 31 Jul 2017 14:32:51 +0100
-Subject: [PATCH] =?UTF-8?q?Document=20=E2=80=98aws=E2=80=99=20meaning=20Am?=
- =?UTF-8?q?azon=20Web=20Services=20cloud=20guest.?=
+Subject: [PATCH 1/2] =?UTF-8?q?Document=20=E2=80=98aws=E2=80=99=20meaning?=
+ =?UTF-8?q?=20Amazon=20Web=20Services=20cloud=20guest.?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch b/0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch
new file mode 100644
index 0000000..06f629c
--- /dev/null
+++ b/0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch
@@ -0,0 +1,57 @@
+From 0e25bd8297ddedec14a260b25a6347ccca784df3 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 31 Jul 2017 15:04:28 +0100
+Subject: [PATCH 2/2] tests: Fix ldoms test so it doesn't test the host.
+
+Fixes commit dc0c2972e178a6de9ee87501acca54447ea9c699.
+---
+ tests/ldoms/sbin/uname                  |  2 ++
+ tests/ldoms/sbin/virt-what-cpuid-helper |  2 ++
+ tests/test-ldoms.sh                     | 11 +----------
+ 3 files changed, 5 insertions(+), 10 deletions(-)
+ create mode 100755 tests/ldoms/sbin/uname
+ create mode 100755 tests/ldoms/sbin/virt-what-cpuid-helper
+
+diff --git a/tests/ldoms/sbin/uname b/tests/ldoms/sbin/uname
+new file mode 100755
+index 0000000..9d07262
+--- /dev/null
++++ b/tests/ldoms/sbin/uname
+@@ -0,0 +1,2 @@
++#!/bin/sh -
++echo sparc64
+diff --git a/tests/ldoms/sbin/virt-what-cpuid-helper b/tests/ldoms/sbin/virt-what-cpuid-helper
+new file mode 100755
+index 0000000..42b1f97
+--- /dev/null
++++ b/tests/ldoms/sbin/virt-what-cpuid-helper
+@@ -0,0 +1,2 @@
++#!/bin/sh -
++echo 
+diff --git a/tests/test-ldoms.sh b/tests/test-ldoms.sh
+index 68c3c77..6ae5aba 100755
+--- a/tests/test-ldoms.sh
++++ b/tests/test-ldoms.sh
+@@ -17,18 +17,9 @@
+ 
+ root=tests/ldoms
+ 
+-# Include src dir in PATH
+-export PATH=.:${PATH}
+-
+-arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
+-
+ output="$(./virt-what --test-root=$root 2>&1)"
+-if [[ "${arch}" == sparc* ]]; then
+-    expected="ldoms
++expected="ldoms
+ ldoms-guest"
+-else
+-    expected=""
+-fi
+ 
+ if [ "$output" != "$expected" ]; then
+     echo "$0: test failed because output did not match expected"
+-- 
+2.13.2
+
diff --git a/virt-what.spec b/virt-what.spec
index 17a4628..648b2dd 100644
--- a/virt-what.spec
+++ b/virt-what.spec
@@ -9,6 +9,8 @@ Source0:        http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
 
 # Upstream patch which completes support for AWS.
 Patch0001:      0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch
+# Upstream patch which fixes ldoms test.
+Patch0002:      0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch
 
 # This is provided by the build root, but we make it explicit
 # anyway in case this was dropped from the build root in future.
@@ -80,6 +82,10 @@ Current types of virtualization detected:
 %prep
 %setup -q
 %patch0001 -p1
+%patch0002 -p1
+# Need to fix +x permissions on new files in patch0002...
+chmod +x tests/ldoms/sbin/uname
+chmod +x tests/ldoms/sbin/virt-what-cpuid-helper
 
 
 %build
@@ -110,6 +116,7 @@ fi
 - Add upstream patch which completes support for AWS.
 - Update RPM description section with complete list of supported guests.
 - If ‘make check’ fails, dump ‘test-suite.log’.
+- Add upstream patch which fixes ldoms test.
 
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild