Merge branch 'tizen' into cynara

Change-Id: I7823ffc2dbd0955045402a32827db459c3083c97

diff --cc README
Simple merge

diff --cc packaging/security-tests.spec
Simple merge

diff --cc tests/common/dbus_access.h
index 1c30fbb28ea7f310b7dcdc6cb1eac2c25a020d50,f957a7eeca4596aac6930dec53f28f70e7e8de8f..5250e5c5086dc20f6e4ba426ecd8090383d565e7
--- 1/tests/common/dbus_access.h
--- 2/tests/common/dbus_access.h
+++ b/tests/common/dbus_access.h
@@@ -26,13 -26,9 +26,11 @@@
  #define _DBUS_ACCESS_H_
  
  #include <dbus/dbus.h>
- #include <dbus-glib.h>
- #include <glib-object.h>
  
 +#include <cstdint>
  #include <set>
  #include <string>
 +#include <sys/time.h>
  
  class DBusAccess {
  public:

diff --cc tests/cynara-tests/CMakeLists.txt
Simple merge

diff --cc tests/framework/include/dpl/test/test_runner.h
index df6f54d9e37ea805bd437c6c51534456519d3af4,4b41cfbf82dfb338ecf7c001dc67f0c1948521c1..87438068534683220b8f772c3ba9fadf8f863798
--- 1/tests/framework/include/dpl/test/test_runner.h
--- 2/tests/framework/include/dpl/test/test_runner.h
+++ b/tests/framework/include/dpl/test/test_runner.h
@@@ -141,11 -135,9 +141,11 @@@ class TestRunne
  
      void RunTests();
  
 +    std::string getConcatedFailReason(const std::string &reason);
 +
      void CollectResult(const std::string& id,
                         const std::string& description,
-                        const TestResultsCollectorBase::FailStatus::Type status
+                        const TestResultsCollectorBase::FailStatus status
                             = TestResultsCollectorBase::FailStatus::NONE,
                         const std::string& reason = std::string(),
                         const bool& isPerformanceTest = false,

diff --cc tests/framework/src/test_runner.cpp
Simple merge

diff --cc tests/security-manager-tests/security_manager_tests.cpp
Simple merge