notification: Removing redundant env configuration

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

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

Change-Id: I7ab34095456499e6d84f0c6f1c6da02887b271e3
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/service/notification/cpp-wrapper/unittest/SConscript b/service/notification/cpp-wrapper/unittest/SConscript
index 9c21420..03709bc 100644 (file)
--- a/service/notification/cpp-wrapper/unittest/SConscript
+++ b/service/notification/cpp-wrapper/unittest/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
 ######################################################################
@@ -49,8 +44,6 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-
-notification_wrapper_test_env.AppendUnique(LIBPATH=[lib_env.get('BUILD_DIR')])
 notification_wrapper_test_env.AppendUnique(LIBS=[
     'connectivity_abstraction',
     'oc',
@@ -58,7 +51,6 @@ notification_wrapper_test_env.AppendUnique(LIBS=[
     'oc_logger',
     'coap',
     'resource_directory',
-
 ])
 
 if env.get('WITH_TCP') == True:
@@ -73,17 +65,17 @@ if target_os not in ['windows', 'winrt']:
 
 notification_wrapper_test_env.AppendUnique(LINKFLAGS=['-Wl,--no-as-needed'])
 
-notification_wrapper_test_env.AppendUnique(CXXFLAGS=['-pthread'])
-notification_wrapper_test_env.AppendUnique(LIBS=['pthread'])
+notification_wrapper_test_env.AddPthreadIfNeeded()
 
 notification_wrapper_test_env.PrependUnique(CPPPATH=[
     '#/extlibs/hippomocks/hippomocks',
-    '../provider/inc',
-    '../consumer/inc',
-    '../common',
-    '../../include',
-    '../../src/provider',
-    '../../src/consumer',
+    '#/service/notification/cpp-wrapper/provider/inc',
+    '#/service/notification/cpp-wrapper/consumer/inc',
+    '#/service/notification/cpp-wrapper/common',
+    '#/service/notification/include',
+    '#/service/notification/src/provider',
+    '#/service/notification/src/consumer',
+    '#/resource/c_common',
     '#/resource/csdk/include',
     '#/resource/csdk/stack/include',
     '#/resource/include',
@@ -108,7 +100,7 @@ notification_consumer_wrapper_test = notification_consumer_wrapper_test_env.Prog
     'notification_consumer_wrapper_test',
     notification_consumer_wrapper_test_src)
 Alias("notification_consumer_wrapper_test", notification_consumer_wrapper_test)
-env.AppendTarget('notification_consumer_wrapper_test')
+notification_consumer_wrapper_test_env.AppendTarget('notification_consumer_wrapper_test')
 
 notification_consumer_wrapper_test_src = env.Glob(
     './NSConsumerServiceTest.cpp')
@@ -117,7 +109,7 @@ notification_consumer_wrapper_internaltest = notification_consumer_wrapper_test_
     notification_consumer_wrapper_test_src)
 Alias("notification_consumer_wrapper_internaltest",
       notification_consumer_wrapper_internaltest)
-env.AppendTarget('notification_consumer_wrapper_test')
+notification_consumer_wrapper_test_env.AppendTarget('notification_consumer_wrapper_test')
 
 notification_provider_wrapper_test_src = env.Glob(
     './NSProviderServiceTest2.cpp')
@@ -125,7 +117,7 @@ notification_provider_wrapper_test = notification_provider_wrapper_test_env.Prog
     'notification_provider_wrapper_test',
     notification_provider_wrapper_test_src)
 Alias("notification_provider_wrapper_test", notification_provider_wrapper_test)
-env.AppendTarget('notification_provider_wrapper_test')
+notification_provider_wrapper_test_env.AppendTarget('notification_provider_wrapper_test')
 
 notification_provider_wrapper_test_src = env.Glob(
     './NSProviderServiceTest.cpp')
@@ -134,7 +126,7 @@ notification_provider_wrapper_internaltest = notification_provider_wrapper_test_
     notification_provider_wrapper_test_src)
 Alias("notification_provider_wrapper_internaltest",
       notification_provider_wrapper_internaltest)
-env.AppendTarget('notification_provider_wrapper_test')
+notification_provider_wrapper_test_env.AppendTarget('notification_provider_wrapper_test')
 
 # TODO: Fix this test for more configs and remove this commented line
 if env.get('TEST') == '1':

diff --git a/service/notification/unittest/SConscript b/service/notification/unittest/SConscript
index 70729cf..b8c31af 100644 (file)
--- a/service/notification/unittest/SConscript
+++ b/service/notification/unittest/SConscript
@@ -21,25 +21,20 @@
 ##
 # Notification Unit Test build script
 ##
-
 import os
 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()
+
 SConscript('#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 +46,6 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
 ######################################################################
-notification_test_env.AppendUnique(LIBPATH=[lib_env.get('BUILD_DIR')])
 notification_test_env.AppendUnique(LIBS=[
     'resource_directory',
     'oc',
@@ -67,16 +61,19 @@ if target_os not in ['windows', 'winrt']:
 
 notification_test_env.AppendUnique(LINKFLAGS=['-Wl,--no-as-needed'])
 
+notification_test_env.AddPthreadIfNeeded()
 
-notification_test_env.AppendUnique(CXXFLAGS=['-pthread'])
-notification_test_env.AppendUnique(LIBS=['pthread'])
 
 notification_test_env.PrependUnique(CPPPATH=[
     '../include',
     '../src/consumer',
     '../src/provider',
     '../src/common',
-    src_dir + '/resource/csdk/connectivity/api',
+    '#/resource/csdk/connectivity/api',
+    '#/resource/c_common',
+    '#/resource/c_common/oic_malloc/include',
+    '#/resource/c_common/oic_string/include',
+    '#/resource/c_common/oic_time/include',
 ])
 
 if env.get('WITH_TCP') == True:
@@ -101,7 +98,7 @@ notification_consumer_test_src = env.Glob('./NSConsumerTest2.cpp')
 notification_consumer_test = notification_consumer_test_env.Program(
     'notification_consumer_test', notification_consumer_test_src)
 Alias("notification_consumer_test", notification_consumer_test)
-env.AppendTarget('notification_consumer_test')
+notification_consumer_test_env.AppendTarget('notification_consumer_test')
 
 notification_consumer_test_src = env.Glob('./NSConsumerTest.cpp')
 notification_consumer_internaltest = notification_consumer_test_env.Program(
@@ -112,7 +109,7 @@ notification_provider_test_src = env.Glob('./NSProviderTest2.cpp')
 notification_provider_test = notification_provider_test_env.Program(
     'notification_provider_test', notification_provider_test_src)
 Alias("notification_provider_test", notification_provider_test)
-env.AppendTarget('notification_provider_test')
+notification_provider_test_env.AppendTarget('notification_provider_test')
 
 notification_provider_test_src = env.Glob('./NSProviderTest.cpp')
 notification_provider_internaltest = notification_provider_test_env.Program(