From aa9d272414f45f7f311c1339e33d9970aaab0f89 Mon Sep 17 00:00:00 2001 From: YounghyunJoo Date: Wed, 29 Jul 2015 19:01:56 +0900 Subject: [PATCH] Modify resourceCache unittest buildscript to fix gcc bug - on gcc-4.6 in linux 64bit environment, gcc bug is occurred. To fix it, remove the '-Wnoexcept' option in the SConscript file - additionally, remove constructor, destructor on the unittest class to prevent build error(noexcept tag) on gcc-4.8 Change-Id: I411ca979e607cdfe33ea50f9fe32b88b434320ed Signed-off-by: YounghyunJoo Reviewed-on: https://gerrit.iotivity.org/gerrit/1970 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../src/resourceCache/unittests/DataCacheTest.cpp | 10 ---------- .../src/resourceCache/unittests/ResourceCacheTest.cpp | 10 ---------- .../src/resourceCache/unittests/SConscript | 1 - 3 files changed, 21 deletions(-) diff --git a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp index b51c8cb..31610ba 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp +++ b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp @@ -47,16 +47,6 @@ class DataCacheTest : public TestWithMock CacheID id; protected: - DataCacheTest() - { - - } - - virtual ~DataCacheTest() noexcept(true) - { - - } - virtual void SetUp() { TestWithMock::SetUp(); diff --git a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp index ceaae8c..fec80f8 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp +++ b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp @@ -36,16 +36,6 @@ class ResourceCacheManagerTest : public TestWithMock CacheID id; protected: - ResourceCacheManagerTest() - { - - } - - virtual ~ResourceCacheManagerTest() noexcept(true) - { - - } - virtual void SetUp() { TestWithMock::SetUp(); diff --git a/service/resource-encapsulation/src/resourceCache/unittests/SConscript b/service/resource-encapsulation/src/resourceCache/unittests/SConscript index 4a08b61..15fc270 100644 --- a/service/resource-encapsulation/src/resourceCache/unittests/SConscript +++ b/service/resource-encapsulation/src/resourceCache/unittests/SConscript @@ -64,7 +64,6 @@ cache_test_env.PrependUnique(LIBS = ['rcs_client', 'rcs_common', 'oc', 'octbstac if target_os not in ['windows', 'winrt']: cache_test_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) - cache_test_env.AppendUnique(CCFLAGS = ['-Wnoexcept']) if target_os == 'linux': cache_test_env.AppendUnique(LIBS = ['pthread']) -- 2.7.4