4 files changed, 54 insertions, 0 deletions
diff --git a/media-tv/kodi/files/kodi-18-remove-useless-test.patch b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
new file mode 100644
index 000000000000..144626718b60
--- /dev/null
+++ b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
@@ -0,0 +1,51 @@
+From 6cf1d4aaf9807a209f19e0aea97b44a7ae617f27 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Tue, 23 Jun 2020 14:30:29 -0400
+Subject: [PATCH] [test] TestCPUInfo: remove useless test as we cannot
+ guarantee that they exist
+
+---
+ xbmc/utils/test/TestCPUInfo.cpp | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
+index fab473891356..df74ca3ee995 100644
+--- a/xbmc/utils/test/TestCPUInfo.cpp
++++ b/xbmc/utils/test/TestCPUInfo.cpp
+@@ -73,36 +73,6 @@ TEST(TestCPUInfo, getTemperature)
+ }
+ #endif
+ 
+-TEST(TestCPUInfo, getCPUModel)
+-{
+-  std::string s = g_cpuInfo.getCPUModel();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUBogoMips)
+-{
+-  std::string s = g_cpuInfo.getCPUBogoMips();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUHardware)
+-{
+-  std::string s = g_cpuInfo.getCPUHardware();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPURevision)
+-{
+-  std::string s = g_cpuInfo.getCPURevision();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+-TEST(TestCPUInfo, getCPUSerial)
+-{
+-  std::string s = g_cpuInfo.getCPUSerial();
+-  EXPECT_STRNE("", s.c_str());
+-}
+-
+ TEST(TestCPUInfo, CoreInfo)
+ {
+   ASSERT_TRUE(g_cpuInfo.HasCoreId(0));
diff --git a/media-tv/kodi/kodi-18.6.ebuild b/media-tv/kodi/kodi-18.6.ebuild
index 0a97baf0c630..b73cbf49d2d8 100644
--- a/media-tv/kodi/kodi-18.6.ebuild
+++ b/media-tv/kodi/kodi-18.6.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 PATCHES=(
 	"${FILESDIR}/${PN}-18.5-cassert.patch"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/media-tv/kodi/kodi-18.7.1.ebuild b/media-tv/kodi/kodi-18.7.1.ebuild
index 25f6abdbcdfa..17a04601f751 100644
--- a/media-tv/kodi/kodi-18.7.1.ebuild
+++ b/media-tv/kodi/kodi-18.7.1.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 PATCHES=(
 	"${FILESDIR}/${PN}-18.5-cassert.patch"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/media-tv/kodi/kodi-18.7.ebuild b/media-tv/kodi/kodi-18.7.ebuild
index 25f6abdbcdfa..17a04601f751 100644
--- a/media-tv/kodi/kodi-18.7.ebuild
+++ b/media-tv/kodi/kodi-18.7.ebuild
@@ -16,6 +16,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 PATCHES=(
 	"${FILESDIR}/${PN}-18.5-cassert.patch"
+	"${FILESDIR}/${PN}-18-remove-useless-test.patch"
 )
 
 if [[ ${PV} == *9999 ]] ; then