easy-setup: Removing redundant test configuration

Moving global environment configuration common for all
platforms into build_common/SConscript and removing repeated
lines from service/easy-setup/*.

Bug: https://jira.iotivity.org/browse/IOT-1583

Change-Id: I578d7147ca731ec83599a260510fdcbc9b308ddd
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>

diff --git a/service/easy-setup/enrollee/unittests/SConscript b/service/easy-setup/enrollee/unittests/SConscript
index 958f1c5b426ab31ef19c098378cc3067f201863c..cd0025cb6788ed8ad3711b0549aa5958119ba6b3 100644 (file)
--- a/service/easy-setup/enrollee/unittests/SConscript
+++ b/service/easy-setup/enrollee/unittests/SConscript
@@ -23,23 +23,19 @@
 ##
 
 from tools.scons.RunTest import run_test
-
 Import('env')
 
-if env.get('RELEASE'):
-    env.AppendUnique(CCFLAGS=['-Os'])
-    env.AppendUnique(CPPDEFINES=['NDEBUG'])
-else:
-    env.AppendUnique(CCFLAGS=['-g'])
-
-if env.get('LOGGING'):
-    env.AppendUnique(CPPDEFINES=['TB_LOG'])
-
-lib_env = SConscript('#extlibs/gtest/SConscript')
+gtest_env = SConscript('#extlibs/gtest/SConscript')
+lib_env = gtest_env.Clone()
 rd_mode = env.get('RD_MODE')
 
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 
+if lib_env.get('RELEASE'):
+    lib_env.AppendUnique(CCFLAGS = ['-Os'])
+else:
+    lib_env.AppendUnique(CCFLAGS = ['-g'])
+
 ######################################################################
 #unit test setting
 ######################################################################
@@ -51,7 +47,6 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-easysetup_test_env.AppendUnique(LIBPATH=[lib_env.get('BUILD_DIR')])
 easysetup_test_env.PrependUnique(LIBS=[
     'connectivity_abstraction',
     'oc',
@@ -65,10 +60,12 @@ if target_os not in ['windows', 'winrt']:
         CXXFLAGS=['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
 
 easysetup_test_env.AddPthreadIfNeeded()
-
 easysetup_test_env.PrependUnique(CPPPATH=[
     '#/extlibs/hippomocks/hippomocks',
     '#/resource/include',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
     '#/resource/csdk/connectivity/api',
     '#/resource/csdk/stack/include',
     '#/resource/csdk/include',
@@ -90,10 +87,11 @@ easysetup_enrollee_test_env.AppendUnique(
     LIBS=['ESEnrolleeSDK', 'ESMediatorRich'])
 
 easysetup_enrollee_test_src = env.Glob('./ESEnrolleeTest.cpp')
+
 easysetup_enrollee_test = easysetup_enrollee_test_env.Program(
     'easysetup_enrollee_test', easysetup_enrollee_test_src)
 Alias("easysetup_enrollee_test", easysetup_enrollee_test)
-env.AppendTarget('easysetup_enrollee_test')
+easysetup_enrollee_test_env.AppendTarget('easysetup_enrollee_test')
 
 if env.get('TEST') == '1':
     if target_os in ['linux'] and env.get('SECURED') != '1':

diff --git a/service/easy-setup/mediator/richsdk/unittests/SConscript b/service/easy-setup/mediator/richsdk/unittests/SConscript
index 6818aed523ab968ca03c66ebee5b40e0a9d56ca5..9c1dc4005ab15700a58b2d2b29045103c913112d 100644 (file)
--- a/service/easy-setup/mediator/richsdk/unittests/SConscript
+++ b/service/easy-setup/mediator/richsdk/unittests/SConscript
@@ -23,21 +23,16 @@
 ##
 
 from tools.scons.RunTest import run_test
-
 Import('env')
 
-if env.get('RELEASE'):
-    env.AppendUnique(CCFLAGS=['-Os'])
-    env.AppendUnique(CPPDEFINES=['NDEBUG'])
-else:
-    env.AppendUnique(CCFLAGS=['-g'])
-
-if env.get('LOGGING'):
-    env.AppendUnique(CPPDEFINES=['TB_LOG'])
-
 gtest_env = SConscript('#extlibs/gtest/SConscript')
 lib_env = gtest_env.Clone()
 
+if lib_env.get('RELEASE'):
+    lib_env.AppendUnique(CCFLAGS = ['-Os'])
+else:
+    lib_env.AppendUnique(CCFLAGS = ['-g'])
+
 ######################################################################
 #unit test setting
 ######################################################################
@@ -50,7 +45,6 @@ target_os = env.get('TARGET_OS')
 # Build flags
 ######################################################################
 
-easysetup_test_env.AppendUnique(LIBPATH=[lib_env.get('BUILD_DIR')])
 easysetup_test_env.PrependUnique(LIBS=[
     'connectivity_abstraction',
     'oc',
@@ -64,9 +58,12 @@ if target_os not in ['windows', 'winrt']:
         CXXFLAGS=['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x'])
 
 easysetup_test_env.AddPthreadIfNeeded()
-
 easysetup_test_env.PrependUnique(CPPPATH=[
     '#/extlibs/hippomocks/hippomocks',
+    '#/resource/c_common',
+    '#/resource/c_common/ocrandom/include',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
     '#/resource/csdk/include',
     '#/resource/csdk/connectivity/api',
     '#/resource/csdk/stack/include',
@@ -95,7 +92,7 @@ easysetup_mediator_test_src = env.Glob(
 easysetup_mediator_test = easysetup_mediator_test_env.Program(
     'easysetup_mediator_test', easysetup_mediator_test_src)
 Alias("easysetup_mediator_test", easysetup_mediator_test)
-env.AppendTarget('easysetup_mediator_test')
+easysetup_mediator_test_env.AppendTarget('easysetup_mediator_test')
 
 if env.get('TEST') == '1':
     if target_os in ['linux'] and env.get('SECURED') != '1':