Merge branch 'ode' into tizen

Change-Id: I22e1736002482934b4a8f85c8eb6303ae02abfc6

diff --cc CMakeLists.txt
index cad0353,ce88a43..26b21d0
--- 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 1ae363e,5beb376..76d554c
--- 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 fe041a6,93c862c..aadbe67
--- 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)