replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / connectivity / test / SConscript

diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript
index 9177c4a..24a0df3 100644 (file)
--- a/resource/csdk/connectivity/test/SConscript
+++ b/resource/csdk/connectivity/test/SConscript
@@ -37,13 +37,6 @@ catest_env.PrependUnique(CPPPATH = [
                 '../../../oc_logger/include',
                ])
 
-tmplist = catest_env['LINKFLAGS'][:]
-if '-lpthread' in tmplist:
-    tmplist.remove('-lpthread')
-    catest_env.Replace(LINKFLAGS = tmplist)
-
-if target_os not in ['windows']:
-       catest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
 catest_env.AppendUnique(LIBPATH = [catest_env.get('BUILD_DIR')])
 catest_env.PrependUnique(LIBS = ['gtest', 'gtest_main'])
 catest_env.PrependUnique(LIBS = ['octbstack',
@@ -54,11 +47,7 @@ if target_os not in ['arduino', 'darwin', 'ios', 'msys_nt', 'windows']:
        catest_env.AppendUnique(LIBS=['rt'])
 
 if catest_env.get('SECURED') == '1':
-       catest_env.AppendUnique(LIBS = ['tinydtls'])
-       catest_env.AppendUnique(LIBS = ['timer'])
-
-if catest_env.get('WITH_RD') == '1':
-       catest_env.PrependUnique(LIBS = ['resource_directory'])
+       catest_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
 
 if catest_env.get('LOGGING'):
        catest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
@@ -67,34 +56,33 @@ if target_os in ['msys_nt', 'windows']:
        catest_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE'])
        catest_env.AppendUnique(LIBS = ['ws2_32',
                                         'advapi32',
+                                        'bcrypt',
                                         'iphlpapi'])
 else:
        catest_env.AppendUnique(LIBS = ['m'])
-       catest_env.PrependUnique(LIBS = ['pthread'])
 
 ######################################################################
 # Source files and Targets
 ######################################################################
 
+tests_src = [
+       'catests.cpp',
+       'caprotocolmessagetest.cpp',
+       'ca_api_unittest.cpp',
+       'octhread_tests.cpp',
+       'uarraylist_test.cpp',
+       'ulinklist_test.cpp',
+       'uqueue_test.cpp'
+]
+
 if (('IP' in target_transport) or ('ALL' in target_transport)):
        if target_os != 'arduino':
-               catests = catest_env.Program('catests', ['catests.cpp',
-                                                        'caprotocolmessagetest.cpp',
-                                                        'cablocktransfertest.cpp',
-                                                        'ca_api_unittest.cpp',
-                                                        'camutex_tests.cpp',
-                                                        'uarraylist_test.cpp',
-                                                        'ulinklist_test.cpp'
-                                                              ])
-else:
-       # Include all unit test files
-               catests = catest_env.Program('catests', ['catests.cpp',
-                                                        'caprotocolmessagetest.cpp',
-                                                        'ca_api_unittest.cpp',
-                                                        'camutex_tests.cpp',
-                                                        'uarraylist_test.cpp',
-                                                        'ulinklist_test.cpp'
-                                                              ])
+               tests_src = tests_src + ['cablocktransfertest.cpp']
+
+if catest_env.get('SECURED') == '1' and catest_env.get('WITH_TCP') == True:
+       tests_src = tests_src + ['ssladapter_test.cpp']
+
+catests = catest_env.Program('catests', tests_src)
 
 Alias("test", [catests])