X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Ftest%2FSConscript;h=507f011f5bf7e4fd446b5ddd4f28751ad14b8ca7;hb=refs%2Ftags%2Fsubmit%2Ftizen_common%2F20160115.042709;hp=a331fa352931edc41fbd79c62c0919278ea95127;hpb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index a331fa3..507f011 100644
--- a/resource/csdk/stack/test/SConscript
+++ b/resource/csdk/stack/test/SConscript
@@ -29,13 +29,17 @@ src_dir = stacktest_env.get('SRC_DIR')
 # Build flags
 ######################################################################
 stacktest_env.PrependUnique(CPPPATH = [
+		'../../security/include',
 		'../../ocsocket/include',
 		'../../logger/include',
+		'../../../c_common/ocrandom/include',
 		'../../stack/include',
-		'../../ocmalloc/include',
+		'../../stack/include/internal',
+		'../../connectivity/api',
+		'../../connectivity/external/inc',
 		'../../extlibs/cjson',
 		'../../../oc_logger/include',
-		'../../../../extlibs/gtest/gtest-1.7.0/include'
+		'#extlibs/gtest/gtest-1.7.0/include'
 		])
 
 stacktest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
@@ -44,6 +48,7 @@ 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',
+                                    'ocsrm',
                                     'connectivity_abstraction',
                                     'coap',
                                     'gtest',
@@ -64,19 +69,15 @@ if env.get('LOGGING'):
 # Source files and Targets
 ######################################################################
 stacktests = stacktest_env.Program('stacktests', ['stacktests.cpp'])
+cbortests = stacktest_env.Program('cbortests', ['cbortests.cpp'])
 
-Alias("test", [stacktests])
+Alias("test", [stacktests, cbortests])
 
 env.AppendTarget('test')
 if env.get('TEST') == '1':
 	target_os = env.get('TARGET_OS')
 	if target_os == 'linux':
-		out_dir = env.get('BUILD_DIR')
-		result_dir = env.get('BUILD_DIR') + '/test_out/'
-		if not os.path.isdir(result_dir):
-			os.makedirs(result_dir)
-		stacktest_env.AppendENVPath('GTEST_OUTPUT', ['xml:'+ result_dir])
-		stacktest_env.AppendENVPath('LD_LIBRARY_PATH', [out_dir])
-		stacktest_env.AppendENVPath('LD_LIBRARY_PATH', ['./extlibs/gtest/gtest-1.7.0/lib/.libs'])
-		ut = stacktest_env.Command ('ut', None, 'valgrind -q --leak-check=full --xml=yes --xml-file=resource_csdk_stack_test.memcheck ' + out_dir + 'resource/csdk/stack/test/stacktests')
-		AlwaysBuild ('ut')
+                from tools.scons.RunTest import *
+                run_test(stacktest_env,
+                         'resource_csdk_stack_test.memcheck',
+                         'resource/csdk/stack/test/stacktests')