X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fsecurity%2Funittest%2FSConscript;h=705c850e01f5a7cbbde8134c91d75e54776d5e89;hb=refs%2Ftags%2Fsubmit%2Ftizen_4.0%2F20171010.021147;hp=2f273cb106d995bd0cb0d7fd20d12417beed360a;hpb=0ac08e1e076304d14934b7a6b8a1d92255ced43b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index 2f273cb..705c850 100644
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -30,12 +30,20 @@ target_os = srmtest_env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
+with_upstream_libcoap = srmtest_env.get('WITH_UPSTREAM_LIBCOAP')
+if with_upstream_libcoap == '1':
+	# For bring up purposes only, we manually copy the forked version to where the unforked version is downloaded.
+	srmtest_env.AppendUnique(CPPPATH = ['#extlibs/libcoap/libcoap/include'])
+else:
+	# For bring up purposes only, the forked version will live here.
+	srmtest_env.AppendUnique(CPPPATH = ['../../connectivity/lib/libcoap-4.1.1/include'])
+
 srmtest_env.PrependUnique(CPPPATH = [
 		'../../../c_common/oic_malloc/include',
 		'../../connectivity/inc',
+		'../../connectivity/inc/pkix',
 		'../../connectivity/api',
 		'../../connectivity/external/inc',
-		'../../connectivity/lib/libcoap-4.1.1',
 		'../include/internal',
 		'../../logger/include',
 		'../../stack/include',
@@ -48,23 +56,26 @@ srmtest_env.PrependUnique(CPPPATH = [
 
 srmtest_env.AppendUnique(LIBPATH = [srmtest_env.get('BUILD_DIR')])
 srmtest_env.PrependUnique(LIBS = ['ocsrm',
-                                    'octbstack',
                                     'oc_logger',
                                     'connectivity_abstraction',
                                     'coap'])
 
 if srmtest_env.get('SECURED') == '1':
-    srmtest_env.AppendUnique(LIBS = ['tinydtls', 'timer'])
+    srmtest_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 
 if srmtest_env.get('LOGGING') == '1':
 	srmtest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
+if srmtest_env.get('MULTIPLE_OWNER') == '1':
+	srmtest_env.AppendUnique(CPPDEFINES=['MULTIPLE_OWNER'])
+
 if target_os == 'windows':
 	srmtest_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE'])
-	srmtest_env.AppendUnique(LIBS = ['advapi32', 'kernel32', 'ws2_32', 'iphlpapi'])
+	srmtest_env.AppendUnique(LIBS = ['advapi32', 'bcrypt', 'kernel32', 'ws2_32', 'iphlpapi', 'octbstack_static'])
 else:
 	# TODO: Implement feature check.
 	srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R'])
+	srmtest_env.AppendUnique(LIBS = ['octbstack'])
 
 ######################################################################
 # Source files and Targets
@@ -79,10 +90,10 @@ unittest = srmtest_env.Program('unittest', ['aclresourcetest.cpp',
                                             'srmutility.cpp',
                                             'iotvticalendartest.cpp',
                                             'base64tests.cpp',
-                                            'svcresourcetest.cpp',
                                             'srmtestcommon.cpp',
                                             'directpairingtest.cpp',
-                                            'crlresourcetest.cpp'])
+                                            'crlresourcetest.cpp',
+                                            'psinterface.cpp'])
 
 Alias("test", [unittest])
 
@@ -110,7 +121,7 @@ srmtest_env.Alias("install", srmtest_env.Install( unittest_build_dir,
     unittest_src_dir + 'oic_svr_db_prov.dat'))
 srmtest_env.Alias("install", srmtest_env.Install( unittest_build_dir,
     unittest_src_dir + 'oic_svr_db.dat'))
-    
+
 srmtest_env.AppendTarget('test')
 if srmtest_env.get('TEST') == '1':
 	if target_os in ['linux', 'windows']: