Merge branch 'ode' into tizen

Change-Id: I22e1736002482934b4a8f85c8eb6303ae02abfc6

diff --cc CMakeLists.txt
index cad03534fab48eaf0d46a3e4526dda27f9cd18b3,ce88a433c2bb2704cb2ce92a33d023e69a9d83d3..26b21d087221c2fe0bd4b4fe5c2ac1264220d038
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -65,7 -64,7 +65,8 @@@ IF(BUILD_ALL_TESTS
      SET(BUILD_CYNARA ON)
      SET(BUILD_WEB ON)
      SET(BUILD_YACA ON)
 +    SET(BUILD_NETHER ON)
+     SET(BUILD_ODE ON)
  ENDIF(BUILD_ALL_TESTS)
  
  # If supported for the target machine, emit position-independent code,suitable

diff --cc packaging/security-tests.spec
index 1ae363e01b94453a546cc2a87d726ce796f4c5f1,5beb376eb17bebcad340bbebf296842ff196f6f7..76d554c24c224db5971fa373a8095f392c26e901
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -117,7 -114,7 +121,8 @@@ echo "security-tests postinst done ...
  %caps(cap_mac_admin=ep) /usr/bin/ckm-privileged-tests
  %caps(cap_mac_admin=ep) /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/nether-tests
+ /usr/bin/ode-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*

diff --cc src/CMakeLists.txt
index fe041a6a9f57c532f17f9a4d6717ac7a040ffab0,93c862c32638f0e72abde07eeb2492226923bd66..aadbe674381f1ddd893bd0c86d38b4d27a9cffbb
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -111,6 -111,6 +111,10 @@@ IF(BUILD_YACA
      ADD_SUBDIRECTORY(yaca)
  ENDIF(BUILD_YACA)
  
 -ENDIF(BUILD_ODE)
 +IF(BUILD_NETHER)
 +    ADD_SUBDIRECTORY(nether-tests)
 +ENDIF(BUILD_NETHER)
++
+ IF(BUILD_ODE)
+     ADD_SUBDIRECTORY(ode)
++ENDIF(BUILD_ODE)