Imported Upstream version 1.1.1

[platform/upstream/iotivity.git] / service / easy-setup / enrollee / unittests / SConscript

diff --git a/service/easy-setup/enrollee/unittests/SConscript b/service/easy-setup/enrollee/unittests/SConscript
index 6dc60e1..ad6c458 100644 (file)
--- a/service/easy-setup/enrollee/unittests/SConscript
+++ b/service/easy-setup/enrollee/unittests/SConscript
@@ -17,11 +17,12 @@
 #
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-Import('env')
 import os
 import os.path
-enrollee_test_env = env.Clone()
 
+# SConscript file for Local PKI google tests
+gtest_env = SConscript('#extlibs/gtest/SConscript')
+enrollee_test_env = gtest_env.Clone()
 src_dir = enrollee_test_env.get('SRC_DIR')
 
 ######################################################################
@@ -29,7 +30,6 @@ src_dir = enrollee_test_env.get('SRC_DIR')
 ######################################################################
 
 enrollee_test_env.PrependUnique(CPPPATH = [
-               enrollee_test_env.get('SRC_DIR') + '/extlibs/gtest/gtest-1.7.0/include',
                enrollee_test_env.get('SRC_DIR') + '/resource/c_common/ocrandom/include',
                enrollee_test_env.get('SRC_DIR') + '/resource/csdk/stack/include/internal',
                enrollee_test_env.get('SRC_DIR') + '/resource/csdk/connectivity/api',
@@ -49,9 +49,8 @@ enrollee_test_env.PrependUnique(CPPPATH = [
                enrollee_test_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src'])
 
 enrollee_test_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
-enrollee_test_env.AppendUnique(LIBS = ['-lpthread'])
-enrollee_test_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-enrollee_test_env.AppendUnique(LIBPATH = [src_dir + '/extlibs/gtest/gtest-1.7.0/lib/.libs'])
+enrollee_test_env.AppendUnique(LIBS = ['pthread'])
+enrollee_test_env.AppendUnique(LIBPATH = [enrollee_test_env.get('BUILD_DIR')])
 enrollee_test_env.PrependUnique(LIBS = ['m',
                                     'octbstack',
                                     'ocsrm',
@@ -60,17 +59,17 @@ enrollee_test_env.PrependUnique(LIBS = ['m',
                                     'gtest',
                                     'gtest_main'])
 
-target_os = env.get('TARGET_OS')
+target_os = enrollee_test_env.get('TARGET_OS')
 if target_os != 'darwin':
     enrollee_test_env.PrependUnique(LIBS = ['oc_logger'])
 
-if env.get('SECURED') == '1':
+if enrollee_test_env.get('SECURED') == '1':
     enrollee_test_env.AppendUnique(LIBS = ['tinydtls'])
 
-if env.get('LOGGING'):
+if enrollee_test_env.get('LOGGING'):
        enrollee_test_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
-if env.get('ES_SOFTAP_MODE') == 'ENROLLEE_SOFTAP':
+if enrollee_test_env.get('ES_SOFTAP_MODE') == 'ENROLLEE_SOFTAP':
        print "ES_SOFTAP_MODE == ENROLLEE_SOFTAP"
        enrollee_test_env.AppendUnique(CPPDEFINES = ['ENROLLEE_SOFTAP'])
 
@@ -83,9 +82,9 @@ enrolleetests = enrollee_test_env.Program('enrolleetests', ['enrolleetests.cpp']
 
 Alias("test", [enrolleetests])
 
-env.AppendTarget('test')
-if env.get('TEST') == '1':
-       target_os = env.get('TARGET_OS')
+enrolleetests.AppendTarget('test')
+if enrollee_test_env.get('TEST') == '1':
+       target_os = enrollee_test_env.get('TARGET_OS')
        if target_os == 'linux':
                 from tools.scons.RunTest import *
                 run_test(enrollee_test_env,