projects
/
platform
/
core
/
test
/
security-tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9509ea0
05c0634
)
Merge branch 'tizen' into cynara
11/32111/1
author
Marcin Niesluchowski
<m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:46:43 +0000
(16:46 +0100)
committer
Marcin Niesluchowski
<m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:49:20 +0000
(16:49 +0100)
Change-Id: I7823ffc2dbd0955045402a32827db459c3083c97
1
2
README
patch
|
diff1
|
diff2
|
blob
|
history
packaging/security-tests.spec
patch
|
diff1
|
diff2
|
blob
|
history
tests/common/dbus_access.h
patch
|
diff1
|
diff2
|
blob
|
history
tests/cynara-tests/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
tests/framework/include/dpl/test/test_runner.h
patch
|
diff1
|
diff2
|
blob
|
history
tests/framework/src/test_runner.cpp
patch
|
diff1
|
diff2
|
blob
|
history
tests/security-manager-tests/security_manager_tests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
README
Simple merge
diff --cc
packaging/security-tests.spec
Simple merge
diff --cc
tests/common/dbus_access.h
index
1c30fbb
,
f957a7e
..
5250e5c
---
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
df6f54d
,
4b41cfb
..
8743806
---
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