Imported Upstream version 0.9.2

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

diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript
index a331fa3..ade8f3f 100644 (file)
--- 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',
+               '../../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',
@@ -71,12 +76,7 @@ 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')