X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fprovisioning%2Funittests%2FSConscript;h=3b38768bc5fe11df67923c2210449e5cca1df031;hb=refs%2Ftags%2Faccepted%2Ftizen%2Funified%2F20230214.171546;hp=5e335a1d02a06c7222451067a5f94d62db68d739;hpb=0ac08e1e076304d14934b7a6b8a1d92255ced43b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript
old mode 100755
new mode 100644
index 5e335a1..3b38768
--- a/resource/provisioning/unittests/SConscript
+++ b/resource/provisioning/unittests/SConscript
@@ -20,6 +20,7 @@
 
 import os
 import os.path
+from tools.scons.RunTest import run_test
 
 # SConscript file for Local PKI google tests
 gtest_env = SConscript('#extlibs/gtest/SConscript')
@@ -40,12 +41,16 @@ provisiontests_env.PrependUnique(CPPPATH = [
 		'../../csdk/security/provisioning/include',
 		'../../csdk/security/provisioning/include/oxm',
 		'../../csdk/security/provisioning/include/internal',
+		'../../csdk/security/provisioning/include/cloud',
 		'../../csdk/stack/include/internal',
 		'../../csdk/connectivity/api',
+		'../../csdk/connectivity/inc/pkix',
 		'../../csdk/connectivity/external/inc',
 		'../../csdk/ocsocket/include',
 		'../../csdk/ocrandom/include',
 		'../../csdk/logger/include',
+		'../../csdk/connectivity/lib/libcoap-4.1.1/include',
+		'../../../extlibs/cjson/',
 		'../../../extlibs/hippomocks-master/HippoMocks',
 		'../../../extlibs/hippomocks-master/HippoMocksTest'
 		])
@@ -63,19 +68,15 @@ provisiontests_env.PrependUnique(LIBS = [
 
 if with_ra_ibb:
 	provisiontests_env.AppendUnique(LIBS = provisiontests_env['RALIBS'], LIBPATH = provisiontests_env['RALIBPATH'], RPATH = provisiontests_env['RARPATH'])
-	print "RALIBS = %s" % provisiontests_env['RALIBS']
-	print "RALIBPATH = %s" % provisiontests_env['RALIBPATH']
-	print "RARPATH = %s" % provisiontests_env['RARPATH']
+	print("RALIBS = %s" % provisiontests_env['RALIBS'])
+	print("RALIBPATH = %s" % provisiontests_env['RALIBPATH'])
+	print("RARPATH = %s" % provisiontests_env['RARPATH'])
 else :
 	if with_ra:
 		provisiontests_env.AppendUnique(LIBS = ['ra_xmpp'])
 
 if provisiontests_env.get('SECURED') == '1':
-    provisiontests_env.AppendUnique(LIBS = ['tinydtls'])
-    provisiontests_env.AppendUnique(LIBS = ['timer'])
-if provisiontests_env.get('DTLS_WITH_X509') == '1':
-	provisiontests_env.AppendUnique(LIBS = ['CKManager'])
-	provisiontests_env.AppendUnique(LIBS = ['asn1'])
+	provisiontests_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
 
 
 if provisiontests_env.get('LOGGING'):
@@ -84,7 +85,16 @@ if provisiontests_env.get('LOGGING'):
 ######################################################################
 # Source files and Targets
 ######################################################################
-unittests = provisiontests_env.Program('provisiontests', ['OCProvisioningTest.cpp'])
+ocprovisiontest_src = [
+	'OCProvisioningTest.cpp'
+	]
+
+if provisiontests_env.get('WITH_TCP') == True:
+	ocprovisiontest_src = ocprovisiontest_src + [
+	'OCCloudProvisioningTest.cpp'
+	]
+
+unittests = provisiontests_env.Program('provisiontests', ocprovisiontest_src)
 
 Alias("provisiontests", [unittests])
 
@@ -97,8 +107,11 @@ if provisiontests_env.get('TEST') == '1':
 			os.makedirs(result_dir)
 		provisiontests_env.AppendENVPath('GTEST_OUTPUT', ['xml:'+ result_dir])
 		provisiontests_env.AppendENVPath('LD_LIBRARY_PATH', [out_dir])
-		ut = provisiontests_env.Command ('ut', None, out_dir + 'resource/provisioning/unittests/provisiontests')
-		AlwaysBuild ('ut')
+		run_test(provisiontests_env,
+# TODO: fix this test on linux and remove this comment line
+#				 'resource_provisioning_unittests.memcheck',
+				 '',
+				 'resource/provisioning/unittests/provisiontests')
 
 src_dir = provisiontests_env.get('SRC_DIR')
 svr_db_src_dir = src_dir + '/resource/provisioning/examples/'