[IOT-2334][IOT-2335] Fixed presence sample app crash issue

[platform/upstream/iotivity.git] / plugins / unittests / SConscript

diff --git a/plugins/unittests/SConscript b/plugins/unittests/SConscript
index bd225dd..c1391df 100644 (file)
--- a/plugins/unittests/SConscript
+++ b/plugins/unittests/SConscript
@@ -18,38 +18,35 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-Import('env')
 import os
 import os.path
-unittests_env = env.Clone()
 
+# SConscript file for Local PKI google tests
+gtest_env = SConscript('#extlibs/gtest/SConscript')
+unittests_env = gtest_env.Clone()
 src_dir = unittests_env.get('SRC_DIR')
 pi_dir = os.path.join(src_dir, 'plugins')
-build_dir = env.get('BUILD_DIR')
+build_dir = unittests_env.get('BUILD_DIR')
+target_os = unittests_env.get('TARGET_OS')
+
 ######################################################################
 # Build flags
 ######################################################################
 unittests_env.PrependUnique(CPPPATH = [
                 os.path.join(pi_dir, 'include'),
-                '#extlibs/gtest/gtest-1.7.0/include',
                ])
 
-unittests_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
-unittests_env.PrependUnique(LIBS = ['-lpthread'])
-unittests_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-unittests_env.AppendUnique(LIBPATH = [os.path.join(src_dir, 'extlibs', 'gtest', 'gtest-1.7.0', 'lib', '.libs')])
+unittests_env.AppendUnique(LIBPATH = [unittests_env.get('BUILD_DIR')])
 unittests_env.PrependUnique(LIBS = [
                'plugin_interface',
                'oc',
                'octbstack',
                'oc_logger',
                'connectivity_abstraction',
-               'coap',
-               'gtest',
-               'gtest_main'
+               'coap'
                ])
 
-if env.get('LOGGING'):
+if unittests_env.get('LOGGING'):
        unittests_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 ######################################################################
@@ -59,12 +56,12 @@ piunittests = unittests_env.Program('piunittests', ['plugininterfacetest.cpp'])
 
 Alias("piunittests", [piunittests])
 
-env.AppendTarget('piunittests')
-if env.get('TEST') == '1':
-       target_os = env.get('TARGET_OS')
-       if target_os == 'linux':
+unittests_env.AppendTarget('piunittests')
+if unittests_env.get('TEST') == '1':
+       if target_os in ['linux']:
                 from tools.scons.RunTest import *
                 run_test(unittests_env,
                          'plugins_unittests.memcheck',
-                         'plugins/unittests/piunittests')
+                         'plugins/unittests/piunittests',
+                         piunittests)