X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Ftest%2FSConscript;h=309dfee2db30762dc2249c5311723a85c12e8f5d;hb=dcd775e27d356943520c236bca901a4d7aa4cd45;hp=507f011f5bf7e4fd446b5ddd4f28751ad14b8ca7;hpb=3e08f0b76cfa2aebd58a6acd4d8a6ae64c5d3cf4;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index 507f011..309dfee 100644
--- a/resource/csdk/stack/test/SConscript
+++ b/resource/csdk/stack/test/SConscript
@@ -18,12 +18,13 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-Import('env')
 import os
 import os.path
-stacktest_env = env.Clone()
 
-src_dir = stacktest_env.get('SRC_DIR')
+# SConscript file for Local PKI google tests
+gtest_env = SConscript('#extlibs/gtest/SConscript')
+stacktest_env = gtest_env.Clone()
+target_os = stacktest_env.get('TARGET_OS')
 
 ######################################################################
 # Build flags
@@ -36,48 +37,51 @@ stacktest_env.PrependUnique(CPPPATH = [
 		'../../stack/include',
 		'../../stack/include/internal',
 		'../../connectivity/api',
+		'../../connectivity/inc/pkix',
 		'../../connectivity/external/inc',
 		'../../extlibs/cjson',
 		'../../../oc_logger/include',
-		'#extlibs/gtest/gtest-1.7.0/include'
 		])
 
-stacktest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
-stacktest_env.AppendUnique(LIBS = ['-lpthread'])
-stacktest_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-stacktest_env.AppendUnique(LIBPATH = [src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs'])
-stacktest_env.PrependUnique(LIBS = ['m',
-                                    'octbstack',
+stacktest_env.AppendUnique(LIBPATH = [stacktest_env.get('BUILD_DIR')])
+stacktest_env.PrependUnique(LIBS = ['octbstack',
                                     'ocsrm',
                                     'connectivity_abstraction',
-                                    'coap',
-                                    'gtest',
-                                    'gtest_main'])
-
-target_os = env.get('TARGET_OS')
+                                    'coap'])
 if target_os != 'darwin':
     stacktest_env.PrependUnique(LIBS = ['oc_logger'])
 
+if stacktest_env.get('SECURED') == '1':
+	stacktest_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509','mbedcrypto'])
 
-if env.get('SECURED') == '1':
-    stacktest_env.AppendUnique(LIBS = ['tinydtls'])
-
-if env.get('LOGGING'):
+if stacktest_env.get('LOGGING'):
 	stacktest_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
+if target_os in ['msys_nt', 'windows']:
+	stacktest_env.AppendUnique(LINKFLAGS = ['/subsystem:CONSOLE'])
+	stacktest_env.AppendUnique(LIBS = ['ws2_32', 'iphlpapi', 'kernel32'])
+else:
+	stacktest_env.PrependUnique(LIBS = ['m'])
+
 ######################################################################
 # Source files and Targets
 ######################################################################
 stacktests = stacktest_env.Program('stacktests', ['stacktests.cpp'])
 cbortests = stacktest_env.Program('cbortests', ['cbortests.cpp'])
+keepalivetests = stacktest_env.Program('keepalivetests', ['oickeepalive_test.cpp'])
 
-Alias("test", [stacktests, cbortests])
+Alias("test", [stacktests, cbortests, keepalivetests])
 
-env.AppendTarget('test')
-if env.get('TEST') == '1':
-	target_os = env.get('TARGET_OS')
-	if target_os == 'linux':
+
+stacktest_env.AppendTarget('test')
+if stacktest_env.get('TEST') == '1':
+	if target_os in ['windows']:
+		stacktest_env.AppendENVPath('PATH', [os.path.join(stacktest_env.get('BUILD_DIR'), 'resource', 'csdk')])
+	if target_os in ['linux', 'windows']:
                 from tools.scons.RunTest import *
                 run_test(stacktest_env,
                          'resource_csdk_stack_test.memcheck',
                          'resource/csdk/stack/test/stacktests')
+                run_test(stacktest_env,
+                         'resource_csdk_stack_keepalivetests.memcheck',
+                         'resource/csdk/stack/test/keepalivetests')