aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortamland <thomas.amland@gmail.com>2016-11-05 16:02:36 +0100
committerGitHub <noreply@github.com>2016-11-05 16:02:36 +0100
commit7bac540eb94225cfddd04c9bf9dac97f9267fd44 (patch)
tree21355702c050dc3c561290b825e7a85bcc26aaf1
parent3f627a55f2f0e59ecfe37399d4af4b455cf6b916 (diff)
parentf95ac76f9194450e4f2fc166532027ef8a7aa76a (diff)
Merge pull request #10817 from tamland/test_fixes
test fixes
-rw-r--r--xbmc/addons/test/CMakeLists.txt4
-rw-r--r--xbmc/utils/test/TestSystemInfo.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/addons/test/CMakeLists.txt b/xbmc/addons/test/CMakeLists.txt
index c168b41e0e..4ce9957aa4 100644
--- a/xbmc/addons/test/CMakeLists.txt
+++ b/xbmc/addons/test/CMakeLists.txt
@@ -1,3 +1,5 @@
-set(SOURCES TestAddonVersion.cpp)
+set(SOURCES TestAddonBuilder.cpp
+ TestAddonFactory.cpp
+ TestAddonVersion.cpp)
core_add_test_library(addons_test)
diff --git a/xbmc/utils/test/TestSystemInfo.cpp b/xbmc/utils/test/TestSystemInfo.cpp
index 79ec2cb892..d09f1730a1 100644
--- a/xbmc/utils/test/TestSystemInfo.cpp
+++ b/xbmc/utils/test/TestSystemInfo.cpp
@@ -126,7 +126,7 @@ TEST_F(TestSystemInfo, GetOsName)
#endif // TARGET_DARWIN
}
-TEST_F(TestSystemInfo, GetOsVersion)
+TEST_F(TestSystemInfo, DISABLED_GetOsVersion)
{
EXPECT_FALSE(g_sysinfo.GetOsVersion().empty()) << "'GetOsVersion()' must not return empty string";
EXPECT_STRNE("0.0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0.0'";