Fix build break caused by gcc/glibc/libstdc++ upgrade.

Change-Id: Ie1fef0cfc63ac4fb5525f7d3731910c77cde9257

diff --git a/src/cynara-tests/CMakeLists.txt b/src/cynara-tests/CMakeLists.txt
index 7a42d65..86c578f 100644 (file)
--- a/src/cynara-tests/CMakeLists.txt
+++ b/src/cynara-tests/CMakeLists.txt
@@ -32,6 +32,7 @@ PKG_CHECK_MODULES(CYNARA_TARGET_DEP
     dbus-1
     glib-2.0
     )
+FIND_PACKAGE (Threads)
 
 #files to compile
 SET(CYNARA_TARGET_TEST_SOURCES
@@ -78,6 +79,7 @@ TARGET_LINK_LIBRARIES(${CYNARA_TARGET_TEST}
     dpl-test-framework
     gobject-2.0
     gio-2.0
+    ${CMAKE_THREAD_LIBS_INIT}
     )
 
 #place for output file

diff --git a/src/cynara-tests/common/cynara_test_admin.cpp b/src/cynara-tests/common/cynara_test_admin.cpp
index 4ff300c..60a78c3 100644 (file)
--- a/src/cynara-tests/common/cynara_test_admin.cpp
+++ b/src/cynara-tests/common/cynara_test_admin.cpp
@@ -129,7 +129,7 @@ CynaraPoliciesContainer::CynaraPoliciesContainer(struct cynara_admin_policy **po
 
 CynaraPoliciesContainer::~CynaraPoliciesContainer()
 {
-    for (struct cynara_admin_policy &policy : m_policies) {
+    for (cynara_admin_policy &policy : m_policies) {
         free(policy.bucket);
         free(policy.client);
         free(policy.user);

diff --git a/src/cynara-tests/test_cases_db.cpp b/src/cynara-tests/test_cases_db.cpp
index 9ac246c..3d07c82 100644 (file)
--- a/src/cynara-tests/test_cases_db.cpp
+++ b/src/cynara-tests/test_cases_db.cpp
@@ -72,8 +72,8 @@ bool unordered_files_match(const std::string &patternFilePath, const std::string
     std::ifstream patternFile(patternFilePath, std::ifstream::in | std::ifstream::binary);
     std::ifstream resultFile(resultFilePath, std::ifstream::in | std::ifstream::binary);
 
-    RUNNER_ASSERT_MSG(patternFile.is_open(), "Failed to open " << patternFile << ".");
-    RUNNER_ASSERT_MSG(resultFile.is_open(), "Failed to open " << resultFile << ".");
+    RUNNER_ASSERT_MSG(patternFile.is_open(), "Failed to open " << patternFilePath << ".");
+    RUNNER_ASSERT_MSG(resultFile.is_open(), "Failed to open " << resultFilePath << ".");
 
     auto patternRecords = std::multiset<std::string>(std::istream_iterator<std::string>(patternFile),
                                                      std::istream_iterator<std::string>());

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 37ad4de..4c54c04 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,6 +23,8 @@ PKG_CHECK_MODULES(INNER_TARGET_DEP
     glib-2.0
     )
 
+FIND_PACKAGE (Threads)
+
 #files to compile
 SET(INNER_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/tests/inner-test.cpp
@@ -48,6 +50,7 @@ TARGET_LINK_LIBRARIES(${INNER_TARGET_TEST}
     ${INNER_TARGET_DEP_LIBRARIES}
     tests-common
     dpl-test-framework
+    ${CMAKE_THREAD_LIBS_INIT}
     )
 
 #place for output file
@@ -62,4 +65,5 @@ INSTALL(TARGETS ${INNER_TARGET_TEST}
                 WORLD_EXECUTE
     )
 
-ADD_SUBDIRECTORY(cleanup)
\ No newline at end of file
+ADD_SUBDIRECTORY(cleanup)
+