From: Tomasz Swierczek <t.swierczek@samsung.com>
Date: Mon, 9 Dec 2024 08:41:18 +0000 (+0100)
Subject: Merge branch 'tizen' into security-manager
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e48766384ac9f73cd5b2bc3ffe8f064007c16b7a;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Merge branch 'tizen' into security-manager

Change-Id: I2182b5350daefac56746a1d8ee56f9e871608c94
---

e48766384ac9f73cd5b2bc3ffe8f064007c16b7a
diff --cc src/security-manager-tests/test_cases_prepare_app.cpp
index 1f69117f,3cb2b2e5..27e36e6d
--- a/src/security-manager-tests/test_cases_prepare_app.cpp
+++ b/src/security-manager-tests/test_cases_prepare_app.cpp
@@@ -26,7 -26,7 +26,8 @@@
  #include <memory>
  #include <mutex>
  #include <fstream>
 +#include <chrono>
+ #include <atomic>
  
  #include <dpl/test/test_runner_child.h>
  #include <dpl/test/test_runner.h>