Refactor directory-hierarchy especially test resources

Change-Id: I481a45049636ab3b593fc79fb41b5c21df1fd8f8
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

6 files changed, 207 insertions, 243 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efb9776..e6660ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,34 +1,28 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(drm-service-core-tizen CXX)
 
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
-
 SET(DRMTESTUTIL drm_test_tizen)
 SET(DRMTAPPSINITIALIZE drm_tizen_initialize)
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-    ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
-    ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
+    ADD_DEFINITIONS("-DDLOG_DEBUG_ENABLE")
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 INCLUDE(FindPkgConfig)
 
-ADD_DEFINITIONS("-DISSUER_ROOT_CERTS_DIR=\"${TZ_SYS_SHARE}/tizen_app_drm/root_certs\"")
-ADD_DEFINITIONS("-DDB_PATH=\"${TZ_SYS_DB}/.dtapps.db\"")
-
+ADD_DEFINITIONS("-DISSUER_ROOT_CERTS_DIR=\"${RO_DATA_DIR}/root_certs\"")
+ADD_DEFINITIONS("-DDB_PATH=\"${DB_DIR}/.dtapps.db\"")
 
 ############################# compiler flags ##################################
-SET(CMAKE_C_FLAGS_PROFILING    "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_CXX_FLAGS_PROFILING  "-g -std=c++0x -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_C_FLAGS_DEBUG        "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_CXX_FLAGS_DEBUG      "-g -std=c++0x -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
+SET(CXX_SPECIFIC_FLAGS         "-std=c++0x")
+SET(CMAKE_C_FLAGS_PROFILING    "-g -O0 -Wp,-U_FORTIFY_SOURCE -pg")
+SET(CMAKE_CXX_FLAGS_PROFILING  "-g -O0 -Wp,-U_FORTIFY_SOURCE -pg ${CXX_SPECIFIC_FLAGS}")
+SET(CMAKE_C_FLAGS_DEBUG        "-g -O0 -Wp,-U_FORTIFY_SOURCE -ggdb")
+SET(CMAKE_CXX_FLAGS_DEBUG      "-g -O0 -Wp,-U_FORTIFY_SOURCE -ggdb ${CXX_SPECIFIG_CLAGS}")
 SET(CMAKE_C_FLAGS_RELEASE      "-g -O2")
-SET(CMAKE_CXX_FLAGS_RELEASE    "-g -std=c++0x -O2")
-SET(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
-SET(CMAKE_CXX_FLAGS_CCOV       "-g -std=c++0x -O2 --coverage")
+SET(CMAKE_CXX_FLAGS_RELEASE    "-g -O2 ${CXX_SPECIFIC_FLAGS}")
+SET(CMAKE_C_FLAGS_CCOV         "${CMAKE_C_FLAGS_RELEASE} --coverage")
+SET(CMAKE_CXX_FLAGS_CCOV       "${CMAKE_CXX_FLAGS_RELEASE} --coverage")
 
 ADD_DEFINITIONS("-fPIC")
 
@@ -37,54 +31,49 @@ ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
 ADD_DEFINITIONS("-Wall")                        # Generate all warnings
 ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
 
-INCLUDE_DIRECTORIES(
-    SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}/tadcore/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/tappsd/inc
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
-pkg_check_modules(DRM_SERVICE_CORE_DEP
+PKG_CHECK_MODULES(DRM_SERVICE_CORE_DEP
     REQUIRED
-	dlog
-	db-util
-	openssl
     cryptsvc
-    libtzplatform-config
+    db-util
+    dlog
+    openssl
 )
 
-INCLUDE_DIRECTORIES(${DRM_SERVICE_CORE_DEP_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+    SYSTEM
+    ${DRM_SERVICE_CORE_DEP_INCLUDE_DIRS}
+    include
+    tadcore/include
+    tappsd/inc
+)
 
 SET(SRCS
-	tadcore/TADCCore/TADC_Core.cpp
-	tadcore/TADCCore/TADC_Sub.cpp
-	tadcore/TADCCore/TADC_Util.cpp
-	tadcore/TADCInterface/TADC_IF.cpp
-	tadcore/Svc/DrmTdcSvc.cpp
-	tappsd/src/intf/drm_intf_tapps.cpp
-	tadcore/XMLParser/CPointerArray.cpp
-	tadcore/XMLParser/CXMLAttribute.cpp
-	tadcore/XMLParser/CXMLElement.cpp
-	tadcore/XMLParser/CXMLFile.cpp
-	tappsd/src/rights/DTapps2Rights.cpp
-	tappsd/src/db/DTapps2SqlData.cpp
-	tappsd/src/db/DTapps2SqliteDB.cpp
-	tappsd/src/util/DTapps2Base64.cpp
-	tappsd/src/util/DTapps2HMAC.cpp
-	tappsd/src/util/DTapps2Time.cpp
-	service/drm-tapps.cpp
-	tadcore/DrmFileHandleMgr/DrmFileHandler.cpp
-	tadcore/DrmFileHandleMgr/DrmFileMgr.cpp
-	tadcore/DrmFileHandleMgr/DrmFileApi.cpp
-
-	#for deviceId
-	tadcore/TADCInterface/DUIDGenerator.cpp
+    service/drm-tapps.cpp
+    tadcore/DrmFileHandleMgr/DrmFileApi.cpp
+    tadcore/DrmFileHandleMgr/DrmFileHandler.cpp
+    tadcore/DrmFileHandleMgr/DrmFileMgr.cpp
+    tadcore/Svc/DrmTdcSvc.cpp
+    tadcore/TADCCore/TADC_Core.cpp
+    tadcore/TADCCore/TADC_Sub.cpp
+    tadcore/TADCCore/TADC_Util.cpp
+    tadcore/TADCInterface/DUIDGenerator.cpp
+    tadcore/TADCInterface/TADC_IF.cpp
+    tadcore/XMLParser/CPointerArray.cpp
+    tadcore/XMLParser/CXMLAttribute.cpp
+    tadcore/XMLParser/CXMLElement.cpp
+    tadcore/XMLParser/CXMLFile.cpp
+    tappsd/src/db/DTapps2SqlData.cpp
+    tappsd/src/db/DTapps2SqliteDB.cpp
+    tappsd/src/intf/drm_intf_tapps.cpp
+    tappsd/src/rights/DTapps2Rights.cpp
+    tappsd/src/util/DTapps2Base64.cpp
+    tappsd/src/util/DTapps2HMAC.cpp
+    tappsd/src/util/DTapps2Time.cpp
 )
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 
-SET_TARGET_PROPERTIES(
-    ${PROJECT_NAME}
+SET_TARGET_PROPERTIES(${PROJECT_NAME}
     PROPERTIES
         COMPILE_FLAGS " -fvisibility=hidden"
         SOVERSION ${MAJORVER}
@@ -96,60 +85,52 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
     -ldevice_info # libdevice_info.so in cryptsvc.
 )
 
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+
 #################################################################
-pkg_check_modules(DRM_INITIALIZE_DEP
+PKG_CHECK_MODULES(DRM_INITIALIZE_DEP
     REQUIRED
-	dlog
-	db-util
-	openssl
-#    cryptsvc
+    db-util
+    dlog
+    openssl
 )
 
 INCLUDE_DIRECTORIES(${DRM_INITIALIZE_DEP_INCLUDE_DIRS})
 
 SET(DRMTAPPSINITIALIZE_SRCS
-	service/drm-tapps-initialize.cpp
-	tappsd/src/intf/drm_intf_tapps.cpp
-	tappsd/src/db/DTapps2SqliteDB.cpp
-	tappsd/src/db/DTapps2SqlData.cpp
+    service/drm-tapps-initialize.cpp
+    tappsd/src/db/DTapps2SqlData.cpp
+    tappsd/src/db/DTapps2SqliteDB.cpp
+    tappsd/src/intf/drm_intf_tapps.cpp
 )
 
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-
-IF("${ARCH}" STREQUAL "arm")
-	ADD_DEFINITIONS("-DTARGET")
-	MESSAGE("add -DTARGET")
-ENDIF("${ARCH}" STREQUAL "arm")
-
-# -fPIE and -pie flag is added for ASLR
-SET_SOURCE_FILES_PROPERTIES(
-    ${DRMTAPPSINITIALIZE_SRCS}
+SET_SOURCE_FILES_PROPERTIES(${DRMTAPPSINITIALIZE_SRCS}
     PROPERTIES
-        COMPILE_FLAGS "-fPIE")
+        COMPILE_FLAGS "-fPIE"
+)
 
 ADD_EXECUTABLE(${DRMTAPPSINITIALIZE} ${DRMTAPPSINITIALIZE_SRCS})
 
 TARGET_LINK_LIBRARIES(${DRMTAPPSINITIALIZE}
     ${DRM_INITIALIZE_DEP_LIBRARIES}
-    -pie)
+    -pie
+)
 
+INSTALL(TARGETS ${DRMTAPPSINITIALIZE} DESTINATION ${BIN_DIR})
 #################################################################
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-
 INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(FILES resource/ro_root_cert.pem
-    DESTINATION ${TZ_SYS_SHARE}/tizen_app_drm/root_certs)
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${DRMTAPPSINITIALIZE} DESTINATION bin)
+INSTALL(FILES resource/ro_root_cert.pem DESTINATION ${RO_DATA_DIR}/root_certs)
 
-INSTALL(DIRECTORY include/ DESTINATION ${INCLUDEDIR}/drm-tizen/)
+INSTALL(FILES include/drm-tizen-apps.h include/drm-tizen-error.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/drm-tizen
+)
 
 #################################################################
 
 IF(DEFINED BUILD_TEST_DRM_SERVICE_CORE_TIZEN)
-ADD_SUBDIRECTORY(test)
+    ADD_DEFINITIONS("-DTEST_DATA_DIR=\"${TEST_DATA_DIR}\"")
+    ADD_SUBDIRECTORY(test)
 ENDIF(DEFINED BUILD_TEST_DRM_SERVICE_CORE_TIZEN)
diff --git a/drm-service-core-tizen.pc.in b/drm-service-core-tizen.pc.in
index 1c0a8af..0895e4a 100644
--- a/drm-service-core-tizen.pc.in
+++ b/drm-service-core-tizen.pc.in
@@ -1,7 +1,7 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
 libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDEDIR@
+includedir=@INCLUDE_INSTALL_DIR@
 
 Name: drm-service-core-tizen
 Description: Tizen Application DRM Plugin
diff --git a/packaging/drm-service-core-tizen.spec b/packaging/drm-service-core-tizen.spec
index 4fb6dc2..d7664a8 100755
--- a/packaging/drm-service-core-tizen.spec
+++ b/packaging/drm-service-core-tizen.spec
@@ -2,7 +2,7 @@
 
 Name:       drm-service-core-tizen
 Summary:    Tizen Application DRM library (Shared Object)
-Version:	0.3.9
+Version:    0.3.9
 Release:    0
 Group:      System/Security
 License:    Flora-1.1 and Apache-2.0
@@ -14,6 +14,11 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(cryptsvc)
 BuildRequires:  pkgconfig(libtzplatform-config)
 
+%global bin_dir %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
+%global ro_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/tizen_app_drm}%{!?TZ_SYS_RO_SHARE:%_datadir/tizen_app_drm}
+%global test_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/drm_test}%{!?TZ_SYS_RO_SHARE:%_datadir/drm_test}
+%global db_dir %{?TZ_SYS_DB:%TZ_SYS_DB}%{!?TZ_SYS_DB:/opt/dbspace}
+
 %description
 Description: Tizen Application DRM library (Shared Object)
 
@@ -39,69 +44,57 @@ Description: Tizen Applicationi DRM library (test)
 %setup -q
 
 %build
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+export LDFLAGS="$LDFLAGS -Wl,--rpath=%{_litdir}"
+
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake .  -DFULLVER=%{version} \
-         -DMAJORVER=${MAJORVER} \
+        -DMAJORVER=${MAJORVER} \
 %if 0%{?test_build_drm_service_core_tizen}
-         -DBUILD_TEST_DRM_SERVICE_CORE_TIZEN=1 \
+        -DBUILD_TEST_DRM_SERVICE_CORE_TIZEN=1 \
+        -DTEST_DATA_DIR=%{test_data_dir} \
 %endif
-         -DPREFIX=%{_prefix} \
-         -DEXEC_PREFIX=%{_exec_prefix} \
-         -DLIBDIR=%{_libdir} \
-         -DBINDIR=%{_bindir} \
-         -DINCLUDEDIR=%{_includedir} \
-         -DTZ_SYS_SHARE=%TZ_SYS_SHARE \
-         -DTZ_SYS_BIN=%TZ_SYS_BIN \
-         -DTZ_SYS_DATA=%TZ_SYS_DATA \
-         -DTZ_SYS_ETC=%TZ_SYS_ETC \
-         -DTZ_SYS_RO_WRT_ENGINE=%TZ_SYS_RO_WRT_ENGINE \
-         -DTZ_SYS_DB=%TZ_SYS_DB \
-         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
-         -DCMAKE_INSTALL_PREFIX=%{_prefix}
-
-make
+        -DBIN_DIR=%{bin_dir} \
+        -DRO_DATA_DIR=%{ro_data_dir} \
+        -DDB_DIR=%{db_dir} \
+        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE}
+
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{TZ_SYS_SHARE}/license/%{name}
-cp  %{_builddir}/%{name}-%{version}/LICENSE.* %{buildroot}%{TZ_SYS_SHARE}/license/%{name}
 %make_install
 
 %post
-/bin/rm -f /etc/ld.so.cache
+%{bin_dir}/rm -f /etc/ld.so.cache
 /sbin/ldconfig
-%{_bindir}/drm_tizen_initialize
-chsmack -a "org.tizen.tsefl" %{TZ_SYS_DB}/.dtapps.db*
-chown :5000 %{TZ_SYS_DB}/.dtapps.db*
-chmod 660 %{TZ_SYS_DB}/.dtapps.db*
+%{bin_dir}/drm_tizen_initialize
+chsmack -a "org.tizen.tsefl" %{db_dir}/.dtapps.db*
+chown :5000 %{db_dir}/.dtapps.db*
+chmod 660 %{db_dir}/.dtapps.db*
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%manifest drm-service-core-tizen.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libdrm-service-core-tizen.so*
-%{_bindir}/drm_tizen_initialize
-%{TZ_SYS_SHARE}/license/%{name}/*
-%{TZ_SYS_SHARE}/tizen_app_drm/root_certs/ro_root_cert.pem
+%manifest %{name}.manifest
+%license LICENSE.*
+%{_libdir}/lib%{name}.so.*
+%{bin_dir}/drm_tizen_initialize
+%{ro_data_dir}/root_certs/ro_root_cert.pem
 
 %files devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/drm-service-core-tizen.pc
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/lib%{name}.so
 %{_includedir}/drm-tizen/drm-tizen-apps.h
 %{_includedir}/drm-tizen/drm-tizen-error.h
-%exclude %{_includedir}/drm-tizen/drm-tizen-mid.h
 
 %if 0%{?test_build_drm_service_core_tizen}
 %files test
-#%defattr(-,root,root,-)
-%{_bindir}/drm_test_tizen
-%{TZ_SYS_DATA}/drm_test/RO/*
-%{TZ_SYS_DATA}/drm_test/DCF/*
-%{TZ_SYS_DATA}/drm_test/DecryptedApp/*
-%{TZ_SYS_DATA}/drm_test/Key/*
-%{TZ_SYS_SHARE}/tizen_app_drm/root_certs/ro_test_root_ca.pem
+%{bin_dir}/drm_test_tizen
+%{test_data_dir}/RO
+%{test_data_dir}/DCF
+%{test_data_dir}/DecryptedApp
+%{test_data_dir}/Key
+%{ro_data_dir}/root_certs/ro_test_root_ca.pem
 %endif
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 65a86bf..b203cbf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,51 +1,48 @@
 pkg_check_modules(DRM_TEST_DEP
     REQUIRED
-	dlog
-	db-util
-	openssl
     cryptsvc
-    libtzplatform-config
+    db-util
+    dlog
+    openssl
 )
 
 SET(DRMTESTUTIL_SRCS
-	${PROJECT_SOURCE_DIR}/test/drm_testapps.cpp
-	${PROJECT_SOURCE_DIR}/test/drm_testcore.cpp
-	${PROJECT_SOURCE_DIR}/test/drm_testutil.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Core.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Sub.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Util.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/TADCInterface/TADC_IF.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/Svc/DrmTdcSvc.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/intf/drm_intf_tapps.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CPointerArray.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLAttribute.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLElement.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLFile.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileApi.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileHandler.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileMgr.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/rights/DTapps2Rights.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/db/DTapps2SqlData.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/db/DTapps2SqliteDB.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2Base64.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2HMAC.cpp
-	${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2Time.cpp
-	${PROJECT_SOURCE_DIR}/service/drm-tapps.cpp
-	${PROJECT_SOURCE_DIR}/tadcore/TADCInterface/DUIDGenerator.cpp
+    drm_testapps.cpp
+    drm_testcore.cpp
+    drm_testutil.cpp
+    ${PROJECT_SOURCE_DIR}/service/drm-tapps.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileApi.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileHandler.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/DrmFileHandleMgr/DrmFileMgr.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/Svc/DrmTdcSvc.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Core.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Sub.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/TADCCore/TADC_Util.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/TADCInterface/DUIDGenerator.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/TADCInterface/TADC_IF.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CPointerArray.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLAttribute.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLElement.cpp
+    ${PROJECT_SOURCE_DIR}/tadcore/XMLParser/CXMLFile.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/db/DTapps2SqlData.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/db/DTapps2SqliteDB.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/intf/drm_intf_tapps.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/rights/DTapps2Rights.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2Base64.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2HMAC.cpp
+    ${PROJECT_SOURCE_DIR}/tappsd/src/util/DTapps2Time.cpp
 )
 
 INCLUDE_DIRECTORIES(
-	SYSTEM
-	${DRM_TEST_DEP_INCLUDE_DIRS}
-	${CMAKE_CURRENT_SOURCE_DIR}/tadcore/include
-	${CMAKE_CURRENT_SOURCE_DIR}/tappsd/inc
-	${CMAKE_CURRENT_SOURCE_DIR}/include
+    SYSTEM
+    ${DRM_TEST_DEP_INCLUDE_DIRS}
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_SOURCE_DIR}/tadcore/include
+    ${PROJECT_SOURCE_DIR}/tappsd/inc
 )
 
-ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
 ADD_DEFINITIONS("-DTEST_CODE_ENABLED")
 
-
 SET_SOURCE_FILES_PROPERTIES(
     ${DRMTESTUTIL_SRCS}
     PROPERTIES
@@ -60,59 +57,53 @@ TARGET_LINK_LIBRARIES(${DRMTESTUTIL}
 )
 
 INSTALL(TARGETS ${DRMTESTUTIL}
-	DESTINATION ${TZ_SYS_BIN}
-	PERMISSIONS
-		OWNER_READ
-		OWNER_WRITE
-		OWNER_EXECUTE
-		GROUP_READ
-		GROUP_EXECUTE
-		WORLD_READ
-		WORLD_EXECUTE
+    DESTINATION ${BIN_DIR}
+    PERMISSIONS
+        OWNER_READ
+        OWNER_WRITE
+        OWNER_EXECUTE
+        GROUP_READ
+        GROUP_EXECUTE
+        WORLD_READ
+        WORLD_EXECUTE
 )
 
 INSTALL(FILES
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DCF/38EIfBurLJ.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DCF/8SPXfqc6iL.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DCF/FightGuiIF.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DCF/basiccoreuiapp_drm.tpk
-	DESTINATION
-	${TZ_SYS_DATA}/drm_test/DCF/
+    sample_contents/DCF/38EIfBurLJ.tpk
+    sample_contents/DCF/8SPXfqc6iL.tpk
+    sample_contents/DCF/basiccoreuiapp_drm.tpk
+    sample_contents/DCF/FightGuiIF.tpk
+    DESTINATION ${TEST_DATA_DIR}/DCF
 )
 
 INSTALL(FILES
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/8SPXfqc6iL-1.0.0.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/FightGuiIF-1.0.0.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.cert_chain_invalid.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.cert_invalid.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.cert_only_selfsigned.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.signature_invalid.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/8SPXfqc6iL-1.0.0.signature_invalid.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/FightGuiIF-1.0.0.signature_invalid.ro
-	${PROJECT_SOURCE_DIR}/test/sample_contents/RO/38EIfBurLJ-1.0.2.ro_template
-	DESTINATION
-	${TZ_SYS_DATA}/drm_test/RO/
+    sample_contents/RO/38EIfBurLJ-1.0.2.cert_chain_invalid.ro
+    sample_contents/RO/38EIfBurLJ-1.0.2.cert_invalid.ro
+    sample_contents/RO/38EIfBurLJ-1.0.2.cert_only_selfsigned.ro
+    sample_contents/RO/38EIfBurLJ-1.0.2.ro
+    sample_contents/RO/38EIfBurLJ-1.0.2.ro_template
+    sample_contents/RO/38EIfBurLJ-1.0.2.signature_invalid.ro
+    sample_contents/RO/8SPXfqc6iL-1.0.0.ro
+    sample_contents/RO/8SPXfqc6iL-1.0.0.signature_invalid.ro
+    sample_contents/RO/FightGuiIF-1.0.0.ro
+    sample_contents/RO/FightGuiIF-1.0.0.signature_invalid.ro
+    DESTINATION ${TEST_DATA_DIR}/RO
 )
 
 INSTALL(FILES
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DecryptedApp/38EIfBurLJ_dec.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DecryptedApp/8SPXfqc6iL_dec.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DecryptedApp/FightGuiIF_dec.tpk
-	${PROJECT_SOURCE_DIR}/test/sample_contents/DecryptedApp/basiccoreuiapp_signed.tpk
-	DESTINATION
-	${TZ_SYS_DATA}/drm_test/DecryptedApp/
+    sample_contents/DecryptedApp/38EIfBurLJ_dec.tpk
+    sample_contents/DecryptedApp/8SPXfqc6iL_dec.tpk
+    sample_contents/DecryptedApp/basiccoreuiapp_signed.tpk
+    sample_contents/DecryptedApp/FightGuiIF_dec.tpk
+    DESTINATION ${TEST_DATA_DIR}/DecryptedApp
 )
 
 INSTALL(FILES
-	${PROJECT_SOURCE_DIR}/test/sample_contents/KEYS/ro_test_signer.key
-	DESTINATION
-	${TZ_SYS_DATA}/drm_test/Key/
+    sample_contents/KEYS/ro_test_signer.key
+    DESTINATION ${TEST_DATA_DIR}/Key
 )
 
 INSTALL(FILES
-	${PROJECT_SOURCE_DIR}/test/sample_contents/KEYS/ro_test_root_ca.pem
-	DESTINATION
-	${TZ_SYS_SHARE}/tizen_app_drm/root_certs/
+    sample_contents/KEYS/ro_test_root_ca.pem
+    DESTINATION ${RO_DATA_DIR}/root_certs
 )
-
diff --git a/test/drm_testapps.cpp b/test/drm_testapps.cpp
index fbb3d3b..07c2194 100644
--- a/test/drm_testapps.cpp
+++ b/test/drm_testapps.cpp
@@ -27,7 +27,6 @@
 #include "DTapps2Rights.h"
 #include "drm_testutil.h"
 #include "drm_testcore.h"
-#include <tzplatform_config.h>
 
 #if 1
 static int first_key = 0;
@@ -71,7 +70,7 @@ bool tc01_VerifyRoSignature_Positive_01(void)
 {
 	printf("tc01_VerifyRoSignature_Positive_01() -------- Started! \n");
 
-	const char *pRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.ro");
+	const char *pRo = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -89,7 +88,7 @@ bool tc01_VerifyRoSignature_Positive_01(void)
 bool tc01_VerifyRoSignature_Positive_02(void)
 {
 	printf("tc01_VerifyRoSignature_Positive_02() -------- Started! \n");
-	const char *pRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/8SPXfqc6iL-1.0.0.ro");
+	const char *pRo = TEST_DATA_DIR "/RO/8SPXfqc6iL-1.0.0.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -107,7 +106,7 @@ bool tc01_VerifyRoSignature_Positive_03(void)
 {
 	printf("tc01_VerifyRoSignature_Positive_03() -------- Started! \n");
 
-	const char *pRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/FightGuiIF-1.0.0.ro");
+	const char *pRo = TEST_DATA_DIR "/RO/FightGuiIF-1.0.0.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -126,7 +125,7 @@ bool tc02_VerifyRoSignature_Negative_Cert_01(void)
 {
 	printf("tc02_VerifyRoSignature_Negative_Cert_01() -------- Started! \n");
 
-	const char *pRo  = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.cert_only_selfsigned.ro");
+	const char *pRo  = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.cert_only_selfsigned.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -144,7 +143,7 @@ bool tc02_VerifyRoSignature_Negative_Cert_02(void)
 {
 	printf("tc02_VerifyRoSignature_Negative_Cert_02() -------- Started! \n");
 
-	const char *pRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.cert_chain_invalid.ro");
+	const char *pRo = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.cert_chain_invalid.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -162,7 +161,7 @@ bool tc02_VerifyRoSignature_Negative_Cert_03(void)
 {
 	printf("tc02_VerifyRoSignature_Negative_Cert_03() -------- Started! \n");
 
-	const char *pRo  = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.cert_invalid.ro");
+	const char *pRo  = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.cert_invalid.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -180,7 +179,7 @@ bool tc03_VerifyRoSignature_Negative_Signature_01(void)
 {
 	printf("tc03_VerifyRoSignature_Negative_Signature_01() -------- Started! \n");
 
-	const char *pRo   = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/FightGuiIF-1.0.0.signature_invalid.ro");
+	const char *pRo   = TEST_DATA_DIR "/RO/FightGuiIF-1.0.0.signature_invalid.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -199,7 +198,7 @@ bool tc03_VerifyRoSignature_Negative_Signature_02(void)
 {
 	printf("tc03_VerifyRoSignature_Negative_Signature_02() -------- Started! \n");
 
-	const char *pRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.signature_invalid.ro");
+	const char *pRo = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.signature_invalid.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -218,7 +217,7 @@ bool tc03_VerifyRoSignature_Negative_Signature_03(void)
 {
 	printf("tc03_VerifyRoSignature_Negative_Signature_03() -------- Started! \n");
 
-	const char *pRo  = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/8SPXfqc6iL-1.0.0.signature_invalid.ro");
+	const char *pRo  = TEST_DATA_DIR "/RO/8SPXfqc6iL-1.0.0.signature_invalid.ro";
 
 	auto buf = _read_ro_file(pRo);
 
@@ -235,7 +234,7 @@ bool tc03_VerifyRoSignature_Negative_Signature_03(void)
 
 bool tc04_isDrmFile_Positive_01(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
 
 	printf("tc04_isDrmFile_Positive_01() -------- Started!\n");
 
@@ -253,7 +252,7 @@ bool tc04_isDrmFile_Positive_01(void)
 
 bool tc04_isDrmFile_Positive_02(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/8SPXfqc6iL.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/8SPXfqc6iL.tpk";
 
 	printf("tc04_isDrmFile_Positive_02() -------- Started!\n");
 
@@ -271,7 +270,7 @@ bool tc04_isDrmFile_Positive_02(void)
 
 bool tc04_isDrmFile_Positive_03(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/FightGuiIF.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/FightGuiIF.tpk";
 
 	printf("tc04_isDrmFile_Positive_03() -------- Started!\n");
 
@@ -289,7 +288,7 @@ bool tc04_isDrmFile_Positive_03(void)
 
 bool tc05_isDrmFile_Negative_01(void)
 {
-	const char *pApp = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DecryptedApp/38EIfBurLJ_dec.tpk");
+	const char *pApp = TEST_DATA_DIR "/DecryptedApp/38EIfBurLJ_dec.tpk";
 
 	printf("tc05_isDrmFile_Negative_01() -------- Started! \n");
 
@@ -306,7 +305,7 @@ bool tc05_isDrmFile_Negative_01(void)
 
 bool tc05_isDrmFile_Negative_02(void)
 {
-	const char *pApp = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DecryptedApp/8SPXfqc6iL_dec.tpk");
+	const char *pApp = TEST_DATA_DIR "/DecryptedApp/8SPXfqc6iL_dec.tpk";
 
 	printf("tc05_isDrmFile_Negative_02() -------- Started! \n");
 
@@ -323,7 +322,7 @@ bool tc05_isDrmFile_Negative_02(void)
 
 bool tc05_isDrmFile_Negative_03(void)
 {
-	const char *pApp = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DecryptedApp/FightGuiIF_dec.tpk");
+	const char *pApp = TEST_DATA_DIR "/DecryptedApp/FightGuiIF_dec.tpk";
 
 	printf("tc05_isDrmFile_Negative_03() -------- Started! \n");
 
@@ -341,7 +340,7 @@ bool tc05_isDrmFile_Negative_03(void)
 bool
 tc06_DrmFileHandlerPositive_01(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
 	DrmFileHandler* pDcfHandler = NULL;
 	unsigned char* pBufCEK = NULL;
 	unsigned char pCEK[CEK_SIZE + 1] = {0xB1, 0x03, 0x4F, 0x30, 0xC8, 0x52, 0x45, 0x7E, 0x9D, 0xA2, 0x52, 0x25, 0x2E, 0xA9, 0x9B, 0x2B, 0x25, 0x36, 0xF1, 0x8D, 0x04, 0xD1, 0x4C, 0xE3, 0x96, 0x81, 0xD9, 0x98, 0xBB, 0xD7, 0x7E, 0xCA, 0x00};
@@ -444,7 +443,7 @@ CATCH:
 bool
 tc06_DrmFileHandlerPositive_02(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/8SPXfqc6iL.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/8SPXfqc6iL.tpk";
 	unsigned char* pBufCEK = NULL;
 	DrmFileHandler* pDcfHandler = NULL;
 	unsigned char pCEK[CEK_SIZE + 1] = {0xBB, 0x87, 0x5D, 0xA8, 0x2C, 0xC4, 0x47, 0x81, 0x90, 0xBA, 0xD9, 0xB0, 0x0C, 0xD2, 0x94, 0xE9, 0x19, 0x0F, 0x24, 0x62, 0x5B, 0x0B, 0x49, 0x7A, 0xAE, 0x8E, 0x1D, 0x88, 0x7F, 0xF9, 0x96, 0xDB, 0x00};
@@ -547,7 +546,7 @@ CATCH:
 bool
 tc06_DrmFileHandlerPositive_03(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/FightGuiIF.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/FightGuiIF.tpk";
 	unsigned char* pBufCEK = NULL;
 	DrmFileHandler* pDcfHandler = NULL;
 	unsigned char pCEK[CEK_SIZE + 1] = {0x34, 0x5A, 0x94, 0x28, 0xC3, 0xF4, 0x44, 0x3F, 0x86, 0x6D, 0xCF, 0xC5, 0x78, 0x1F, 0x23, 0xCE, 0xE9, 0x9B, 0xC4, 0x45, 0xA3, 0x30, 0x47, 0x1E, 0xB4, 0xE0, 0xAF, 0x96, 0x0F, 0xDE, 0xA9, 0xB4, 0x00};
@@ -649,7 +648,7 @@ CATCH:
 
 bool tc07_DrmFileMgrPositive_01(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -734,7 +733,7 @@ CATCH:
 
 bool tc07_DrmFileMgrPositive_02(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/8SPXfqc6iL.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/8SPXfqc6iL.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -819,7 +818,7 @@ CATCH:
 
 bool tc07_DrmFileMgrPositive_03(void)
 {
-	const char *pDCF  = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/FightGuiIF.tpk");
+	const char *pDCF  = TEST_DATA_DIR "/DCF/FightGuiIF.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -905,7 +904,7 @@ CATCH:
 
 bool tc08_DrmFileMgrPositive_GetFileHandler_01(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -984,7 +983,7 @@ CATCH:
 
 bool tc08_DrmFileMgrPositive_GetFileHandler_02(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/8SPXfqc6iL.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/8SPXfqc6iL.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -1063,7 +1062,7 @@ CATCH:
 
 bool tc08_DrmFileMgrPositive_GetFileHandler_03(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/FightGuiIF.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/FightGuiIF.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -1142,7 +1141,7 @@ CATCH:
 
 bool tc09_DrmFileMgrPositive_FileAPI_01(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -1318,7 +1317,7 @@ CATCH:
 
 bool tc09_DrmFileMgrPositive_FileAPI_02(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/8SPXfqc6iL.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/8SPXfqc6iL.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -1494,7 +1493,7 @@ CATCH:
 
 bool tc09_DrmFileMgrPositive_FileAPI_03(void)
 {
-	const char *pDCF = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/FightGuiIF.tpk");
+	const char *pDCF = TEST_DATA_DIR "/DCF/FightGuiIF.tpk";
 	int nRet = TADC_SUCCESS;
 
 	DrmFileMgr* pDrmFileMgr = NULL;
@@ -1831,7 +1830,7 @@ bool tc13_DTappsInstallLicense_01(void)
 {
 	printf("tc13_DTappsInstallLicense_01() -------- Started! \n");
 
-	const char *pFirstRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.ro");
+	const char *pFirstRo = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.ro";
 
 	auto buf = _read_ro_file(pFirstRo);
 
@@ -1849,7 +1848,7 @@ bool tc13_DTappsInstallLicense_02(void)
 {
 	printf("tc13_DTappsInstallLicense_02() -------- Started! \n");
 
-	const char *pFirstRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/8SPXfqc6iL-1.0.0.ro");
+	const char *pFirstRo = TEST_DATA_DIR "/RO/8SPXfqc6iL-1.0.0.ro";
 
 	auto buf = _read_ro_file(pFirstRo);
 
@@ -1867,7 +1866,7 @@ bool tc13_DTappsInstallLicense_03(void)
 {
 	printf("tc13_DTappsInstallLicense_03() -------- Started! \n");
 
-	const char *pFirstRo = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/FightGuiIF-1.0.0.ro");
+	const char *pFirstRo = TEST_DATA_DIR "/RO/FightGuiIF-1.0.0.ro";
 
 	auto buf = _read_ro_file(pFirstRo);
 
@@ -1944,10 +1943,10 @@ tc_local_01_drm_tizen_full_test_p(void)
 
     unsigned char duid[33] = {0,};
     const char* cid = "38EIfBurLJ-1.0.2";
-    const char* ro_template_path = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/RO/38EIfBurLJ-1.0.2.ro_template");
+    const char* ro_template_path = TEST_DATA_DIR "/RO/38EIfBurLJ-1.0.2.ro_template";
 
-    const char* encrypted_file_path = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DCF/38EIfBurLJ.tpk");
-    const char* plaintext_file_path = tzplatform_mkpath(TZ_SYS_DATA,"drm_test/DecryptedApp/38EIfBurLJ_dec.tpk");
+    const char* encrypted_file_path = TEST_DATA_DIR "/DCF/38EIfBurLJ.tpk";
+    const char* plaintext_file_path = TEST_DATA_DIR "/DecryptedApp/38EIfBurLJ_dec.tpk";
     const char* decrypted_file_path = "/tmp/38EIfBurLJ.tpk";
 
     int identical = DRMTEST_NOTIDENTICAL;
diff --git a/test/drm_testutil.h b/test/drm_testutil.h
index 6f2a70e..bd94195 100644
--- a/test/drm_testutil.h
+++ b/test/drm_testutil.h
@@ -20,7 +20,7 @@
 
 #define RIURL "http://appdrm.test.com/"
 
-#define RO_ISSUER_SIGNER_KEY_FILE tzplatform_mkpath(TZ_SYS_DATA, "drm_test/Key/ro_test_signer.key")
+#define RO_ISSUER_SIGNER_KEY_FILE TEST_DATA_DIR "/Key/ro_test_signer.key"
 
 #define STR_PLACE_HOLDER_CID        "PLACE_HOLDER_FOR_CID"
 #define STR_PLACE_HOLDER_DUID       "PLACE_HOLDER_FOR_DUID"