[IOT-2011] linker changes for oc_logger

[platform/upstream/iotivity.git] / resource / csdk / security / unittest / SConscript

diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript
index d124322..8782e86 100644 (file)
--- a/resource/csdk/security/unittest/SConscript
+++ b/resource/csdk/security/unittest/SConscript
@@ -49,6 +49,7 @@ srmtest_env.PrependUnique(CPPPATH = [
                '../../connectivity/external/inc',
                '../include/internal',
                '../../logger/include',
+               '../../include',
                '../../stack/include',
                '../../stack/include/internal',
                '../../../oc_logger/include',
@@ -56,16 +57,14 @@ srmtest_env.PrependUnique(CPPPATH = [
                '../include'
                ])
 
-srmtest_env.AppendUnique(LIBPATH = [srmtest_env.get('BUILD_DIR')])
 srmtest_env.PrependUnique(LIBS = ['ocsrm',
                                     'octbstack_test',
-                                    'oc_logger',
+                                    'oc_logger_internal',
                                     'connectivity_abstraction',
                                     'coap'])
 
 if srmtest_env.get('SECURED') == '1':
     srmtest_env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
-    srmtest_env.AppendUnique(LIBS = ['tinydtls'])
 
 if srmtest_env.get('LOGGING') == '1':
        srmtest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
@@ -74,16 +73,12 @@ 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 = ['octbstack_static'])
+       srmtest_env.AppendUnique(LIBS = ['octbstack_static', 'sqlite3'])
 else:
        # TODO: Implement feature check.
        srmtest_env.AppendUnique(CPPDEFINES = ['HAVE_LOCALTIME_R'])
        srmtest_env.AppendUnique(LIBS = ['octbstack'])
 
-if 'CLIENT' in rd_mode or 'SERVER' in rd_mode:
-       srmtest_env.PrependUnique(LIBS = ['resource_directory'])
-
 ######################################################################
 # Source files and Targets
 ######################################################################
@@ -98,7 +93,6 @@ unittest = srmtest_env.Program('unittest', ['aclresourcetest.cpp',
                                             'iotvticalendartest.cpp',
                                             'base64tests.cpp',
                                             'pbkdf2tests.cpp',
-                                            'svcresourcetest.cpp',
                                             'srmtestcommon.cpp',
                                             'directpairingtest.cpp',
                                             'crlresourcetest.cpp'])
@@ -106,9 +100,10 @@ unittest = srmtest_env.Program('unittest', ['aclresourcetest.cpp',
 Alias("test", [unittest])
 
 unittest_src_dir = os.path.join(src_dir, 'resource', 'csdk', 'security', 'unittest') + os.sep
-unittest_build_dir = os.path.join(srmtest_env.get('BUILD_DIR'), 'resource', 'csdk', 'security', 'unittest') + os.sep
+unittest_build_dir = os.path.join(srmtest_env.get('BUILD_DIR'), 'resource', 'csdk', 'security', 'unittest')
+unittest_build_dir = os.path.normpath(unittest_build_dir) + os.sep 
 
-srmtest_env.AppendUnique(CPPDEFINES = ['SECURITY_BUILD_UNITTEST_DIR='+unittest_build_dir.encode('string_escape')])
+srmtest_env.AppendUnique(CPPDEFINES = ['SECURITY_BUILD_UNITTEST_DIR='+unittest_build_dir.encode('string_escape').replace("\\", "\\\\")])
 
 srmtest_env.Alias("install", srmtest_env.Install( unittest_build_dir,
     unittest_src_dir + 'oic_unittest.json'))