commit: a4886afa2c9569e600a4dca81e4eee4c46a77cfa Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Jun 23 18:40:29 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Jun 23 18:44:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4886afa
media-tv/kodi: backport disabling useless tests Closes: https://bugs.gentoo.org/729204 Package-Manager: Portage-2.3.102, Repoman-2.3.23 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../kodi/files/kodi-18-remove-useless-test.patch | 51 ++++++++++++++++++++++ media-tv/kodi/kodi-18.6.ebuild | 1 + media-tv/kodi/kodi-18.7.1.ebuild | 1 + media-tv/kodi/kodi-18.7.ebuild | 1 + 4 files changed, 54 insertions(+) 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 00000000000..144626718b6 --- /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 <candr...@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 0a97baf0c63..b73cbf49d2d 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 25f6abdbcdf..17a04601f75 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 25f6abdbcdf..17a04601f75 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
