From eab8200309284ef9d08ce07bb43773dccbbde31a Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 26 Apr 2017 12:50:27 +0200 Subject: [PATCH] notification: Drop unnecessary gtest flags This will help for upgrading gtest to latest release Bug: https://jira.iotivity.org/browse/IOT-1745 Change-Id: I4ddf3bb98ad257d8bb21b5e0ef388405d574131c Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/19775 Tested-by: jenkins-iotivity Reviewed-by: Jaehong Jo Reviewed-by: Pawel Winogrodzki --- service/notification/cpp-wrapper/unittest/SConscript | 12 ++++-------- service/notification/unittest/SConscript | 15 +++++---------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/service/notification/cpp-wrapper/unittest/SConscript b/service/notification/cpp-wrapper/unittest/SConscript index 29aa013..a4e5363 100644 --- a/service/notification/cpp-wrapper/unittest/SConscript +++ b/service/notification/cpp-wrapper/unittest/SConscript @@ -33,14 +33,13 @@ else: if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['TB_LOG']) -lib_env = env.Clone() -SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env') +gtest_env = SConscript('#extlibs/gtest/SConscript') +lib_env = gtest_env.Clone() ###################################################################### #unit test setting ###################################################################### src_dir = lib_env.get('SRC_DIR') -gtest_dir = src_dir + '/extlibs/gtest/googletest-release-1.7.0' notification_wrapper_test_env = lib_env.Clone() target_os = env.get('TARGET_OS') @@ -48,13 +47,11 @@ target_os = env.get('TARGET_OS') ###################################################################### # Build flags ###################################################################### -GTest = File(gtest_dir + '/lib/.libs/libgtest.a') -GTest_Main = File(gtest_dir + '/lib/.libs/libgtest_main.a') notification_wrapper_test_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')]) notification_wrapper_test_env.AppendUnique(LIBS = [ - 'connectivity_abstraction', 'oc', 'octbstack', 'oc_logger', 'coap', 'resource_directory', - GTest_Main, GTest]) + 'connectivity_abstraction', 'oc', 'octbstack', 'oc_logger', 'coap', 'resource_directory' +]) if env.get('WITH_TCP') == True: notification_wrapper_test_env.AppendUnique(CPPDEFINES = ['WITH_TCP']) @@ -71,7 +68,6 @@ notification_wrapper_test_env.AppendUnique(LIBS = ['pthread']) notification_wrapper_test_env.PrependUnique(CPPPATH = [ '#/extlibs/hippomocks/hippomocks', - gtest_dir + '/include', '../provider/inc', '../consumer/inc', '../common', diff --git a/service/notification/unittest/SConscript b/service/notification/unittest/SConscript index 2d9bc11..ec4f51d 100644 --- a/service/notification/unittest/SConscript +++ b/service/notification/unittest/SConscript @@ -35,14 +35,14 @@ else: if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['TB_LOG']) -lib_env = env.Clone() -SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env') +gtest_env = SConscript('#extlibs/gtest/SConscript') +lib_env = gtest_env.Clone() +SConscript('#service/third_party_libs.scons', 'lib_env') ###################################################################### #unit test setting ###################################################################### src_dir = lib_env.get('SRC_DIR') -gtest_dir = src_dir + '/extlibs/gtest/googletest-release-1.7.0' notification_test_env = lib_env.Clone() target_os = env.get('TARGET_OS') @@ -50,15 +50,12 @@ target_os = env.get('TARGET_OS') ###################################################################### # Build flags ###################################################################### -GTest = File(gtest_dir + '/lib/.libs/libgtest.a') -GTest_Main = File(gtest_dir + '/lib/.libs/libgtest_main.a') - notification_test_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')]) notification_test_env.AppendUnique(LIBS = [ 'resource_directory', 'oc', 'octbstack', 'connectivity_abstraction', 'oc_logger', - 'coap', - GTest_Main, GTest]) + 'coap' +]) if target_os not in ['windows', 'winrt']: notification_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) @@ -67,8 +64,6 @@ notification_test_env.AppendUnique(LINKFLAGS = ['-Wl,--no-as-needed']) notification_test_env.AppendUnique(CXXFLAGS = ['-pthread']) notification_test_env.AppendUnique(LIBS = ['pthread']) - -notification_test_env.PrependUnique(CPPPATH = [ '#/extlibs/hippomocks/hippomocks', gtest_dir + '/include']) notification_test_env.AppendUnique(CPPPATH = ['../include']) notification_test_env.AppendUnique(CPPPATH = ['../src/consumer']) notification_test_env.AppendUnique(CPPPATH = ['../src/provider']) -- 2.7.4