From 592d9133b3fa3de34ae7a4e3375c52969f4dc573 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Fri, 12 May 2017 16:06:26 +0200 Subject: [PATCH] build: Include gtest header using system path Change-Id: If22cffaa199d1057497019fd45c502b8ae69b8de Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/20341 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai (cherry picked from commit 4ec6ab957de7fe29db51e66586f00e40fde6519a) Reviewed-on: https://gerrit.iotivity.org/gerrit/19833 --- plugins/unittests/plugininterfacetest.cpp | 2 +- resource/IPCA/unittests/IPCAElevatorClient.cpp | 2 +- resource/IPCA/unittests/ipcaunittests.cpp | 2 +- resource/c_common/ocrandom/test/android/randomtest.cpp | 2 +- resource/c_common/ocrandom/test/randomtest.cpp | 2 +- resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp | 2 +- resource/c_common/oic_string/test/linux/oic_string_tests.cpp | 2 +- resource/c_common/oic_time/test/linux/oic_time_tests.cpp | 2 +- resource/csdk/connectivity/test/ca_api_unittest.cpp | 2 +- resource/csdk/connectivity/test/cablocktransfertest.cpp | 2 +- resource/csdk/connectivity/test/caprotocolmessagetest.cpp | 2 +- resource/csdk/connectivity/test/catests.cpp | 2 +- resource/csdk/connectivity/test/octhread_tests.cpp | 2 +- resource/csdk/connectivity/test/ssladapter_test.cpp | 2 +- resource/csdk/connectivity/test/uarraylist_test.cpp | 2 +- resource/csdk/connectivity/test/ulinklist_test.cpp | 2 +- resource/csdk/connectivity/test/uqueue_test.cpp | 2 +- resource/csdk/logger/test/loggertests.cpp | 2 +- resource/csdk/resource-directory/unittests/rddatabase.cpp | 2 +- resource/csdk/resource-directory/unittests/rdtests.cpp | 2 +- .../security/provisioning/unittest/credentialgeneratortest.cpp | 2 +- .../security/provisioning/unittest/ocprovisioningmanager.cpp | 2 +- resource/csdk/security/provisioning/unittest/otmunittest.cpp | 2 +- resource/csdk/security/provisioning/unittest/pmutilitytest.cpp | 2 +- .../provisioning/unittest/provisioningdatabasemanager.cpp | 2 +- .../security/provisioning/unittest/secureresourceprovider.cpp | 2 +- resource/csdk/security/unittest/aclresourcetest.cpp | 2 +- resource/csdk/security/unittest/amaclresourcetest.cpp | 2 +- resource/csdk/security/unittest/base64tests.cpp | 2 +- resource/csdk/security/unittest/credentialresource.cpp | 2 +- resource/csdk/security/unittest/crlresourcetest.cpp | 2 +- resource/csdk/security/unittest/directpairingtest.cpp | 2 +- resource/csdk/security/unittest/doxmresource.cpp | 2 +- resource/csdk/security/unittest/iotvticalendartest.cpp | 2 +- resource/csdk/security/unittest/pbkdf2tests.cpp | 2 +- resource/csdk/security/unittest/policyengine.cpp | 2 +- resource/csdk/security/unittest/pstatresource.cpp | 2 +- resource/csdk/security/unittest/securityresourcemanager.cpp | 2 +- resource/csdk/security/unittest/srmtestcommon.cpp | 2 +- resource/csdk/security/unittest/srmutility.cpp | 2 +- resource/csdk/stack/test/cbortests.cpp | 2 +- resource/csdk/stack/test/stacktests.cpp | 2 +- .../src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp | 2 +- .../src/resourceBroker/unittest/DevicePresenceUnitTest.cpp | 2 +- .../src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp | 2 +- .../src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/plugins/unittests/plugininterfacetest.cpp b/plugins/unittests/plugininterfacetest.cpp index 71f2194ad7..25c40cb9c7 100644 --- a/plugins/unittests/plugininterfacetest.cpp +++ b/plugins/unittests/plugininterfacetest.cpp @@ -21,7 +21,7 @@ #include "iotivity_config.h" #include "plugininterface.h" -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/IPCA/unittests/IPCAElevatorClient.cpp b/resource/IPCA/unittests/IPCAElevatorClient.cpp index 8585f49e00..f9e85d4369 100644 --- a/resource/IPCA/unittests/IPCAElevatorClient.cpp +++ b/resource/IPCA/unittests/IPCAElevatorClient.cpp @@ -24,7 +24,7 @@ #include #include -#include "gtest/gtest.h" +#include #include "ocrandom.h" #include "octypes.h" #include "oic_time.h" diff --git a/resource/IPCA/unittests/ipcaunittests.cpp b/resource/IPCA/unittests/ipcaunittests.cpp index 39eafdf5c7..c8d6f8c182 100644 --- a/resource/IPCA/unittests/ipcaunittests.cpp +++ b/resource/IPCA/unittests/ipcaunittests.cpp @@ -24,7 +24,7 @@ #include #include -#include "gtest/gtest.h" +#include #include "ocrandom.h" #include "ipca.h" #include "testelevatorserver.h" diff --git a/resource/c_common/ocrandom/test/android/randomtest.cpp b/resource/c_common/ocrandom/test/android/randomtest.cpp index c115ac5630..caf1caef8d 100644 --- a/resource/c_common/ocrandom/test/android/randomtest.cpp +++ b/resource/c_common/ocrandom/test/android/randomtest.cpp @@ -23,7 +23,7 @@ extern "C" { #include "ocrandom.h" } -#include "gtest/gtest.h" +#include #include "math.h" diff --git a/resource/c_common/ocrandom/test/randomtest.cpp b/resource/c_common/ocrandom/test/randomtest.cpp index 5036113b4e..6b2402564a 100644 --- a/resource/c_common/ocrandom/test/randomtest.cpp +++ b/resource/c_common/ocrandom/test/randomtest.cpp @@ -24,7 +24,7 @@ extern "C" { #include "ocrandom.h" } -#include "gtest/gtest.h" +#include #include "math.h" #define ARR_SIZE (20) diff --git a/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp index e07ca0c664..35b5b99fb3 100644 --- a/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp +++ b/resource/c_common/oic_malloc/test/linux/oic_malloc_tests.cpp @@ -24,7 +24,7 @@ extern "C" { #include "oic_malloc.h" } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/c_common/oic_string/test/linux/oic_string_tests.cpp b/resource/c_common/oic_string/test/linux/oic_string_tests.cpp index 78845f5614..2e13512b28 100644 --- a/resource/c_common/oic_string/test/linux/oic_string_tests.cpp +++ b/resource/c_common/oic_string/test/linux/oic_string_tests.cpp @@ -33,7 +33,7 @@ #define _POSIX_C_SOURCE 200809L #endif // _POSIX_C_SOURCE -#include "gtest/gtest.h" +#include #include #include diff --git a/resource/c_common/oic_time/test/linux/oic_time_tests.cpp b/resource/c_common/oic_time/test/linux/oic_time_tests.cpp index 4e98ef291d..3823ab396c 100644 --- a/resource/c_common/oic_time/test/linux/oic_time_tests.cpp +++ b/resource/c_common/oic_time/test/linux/oic_time_tests.cpp @@ -19,7 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include "oic_time.h" -#include "gtest/gtest.h" +#include #include // Tests to get current time in milli seconds diff --git a/resource/csdk/connectivity/test/ca_api_unittest.cpp b/resource/csdk/connectivity/test/ca_api_unittest.cpp index b091308577..1f741f0095 100644 --- a/resource/csdk/connectivity/test/ca_api_unittest.cpp +++ b/resource/csdk/connectivity/test/ca_api_unittest.cpp @@ -19,7 +19,7 @@ ******************************************************************/ #include "platform_features.h" -#include "gtest/gtest.h" +#include #include "cainterface.h" #include "cautilinterface.h" #include "cacommon.h" diff --git a/resource/csdk/connectivity/test/cablocktransfertest.cpp b/resource/csdk/connectivity/test/cablocktransfertest.cpp index 2ec2c25e92..d36c03d739 100644 --- a/resource/csdk/connectivity/test/cablocktransfertest.cpp +++ b/resource/csdk/connectivity/test/cablocktransfertest.cpp @@ -23,7 +23,7 @@ #pragma warning(disable : 4200) #endif -#include "gtest/gtest.h" +#include #include "cainterface.h" #include "cautilinterface.h" #include "cacommon.h" diff --git a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp index 21f08f436f..e05308b750 100644 --- a/resource/csdk/connectivity/test/caprotocolmessagetest.cpp +++ b/resource/csdk/connectivity/test/caprotocolmessagetest.cpp @@ -25,7 +25,7 @@ #include -#include "gtest/gtest.h" +#include #include "oic_malloc.h" #include "caprotocolmessage.h" diff --git a/resource/csdk/connectivity/test/catests.cpp b/resource/csdk/connectivity/test/catests.cpp index 69eaa14b20..7ec54f5f71 100644 --- a/resource/csdk/connectivity/test/catests.cpp +++ b/resource/csdk/connectivity/test/catests.cpp @@ -19,7 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include "iotivity_config.h" -#include "gtest/gtest.h" +#include #ifdef HAVE_PTHREAD_H #include diff --git a/resource/csdk/connectivity/test/octhread_tests.cpp b/resource/csdk/connectivity/test/octhread_tests.cpp index 08081b37fb..dcf48f7784 100644 --- a/resource/csdk/connectivity/test/octhread_tests.cpp +++ b/resource/csdk/connectivity/test/octhread_tests.cpp @@ -34,7 +34,7 @@ #endif // _POSIX_C_SOURCE #include "iotivity_config.h" -#include "gtest/gtest.h" +#include #include "octhread.h" #include diff --git a/resource/csdk/connectivity/test/ssladapter_test.cpp b/resource/csdk/connectivity/test/ssladapter_test.cpp index 6321d1fbb6..a27e9ee5c5 100644 --- a/resource/csdk/connectivity/test/ssladapter_test.cpp +++ b/resource/csdk/connectivity/test/ssladapter_test.cpp @@ -25,7 +25,7 @@ #include #include "iotivity_config.h" -#include "gtest/gtest.h" +#include #include "time.h" #include "octypes.h" #ifdef HAVE_WINSOCK2_H diff --git a/resource/csdk/connectivity/test/uarraylist_test.cpp b/resource/csdk/connectivity/test/uarraylist_test.cpp index 46d39be9e4..4a37b6c329 100644 --- a/resource/csdk/connectivity/test/uarraylist_test.cpp +++ b/resource/csdk/connectivity/test/uarraylist_test.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "uarraylist.h" diff --git a/resource/csdk/connectivity/test/ulinklist_test.cpp b/resource/csdk/connectivity/test/ulinklist_test.cpp index 9ef777a39e..2f133a0e16 100644 --- a/resource/csdk/connectivity/test/ulinklist_test.cpp +++ b/resource/csdk/connectivity/test/ulinklist_test.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "ulinklist.h" diff --git a/resource/csdk/connectivity/test/uqueue_test.cpp b/resource/csdk/connectivity/test/uqueue_test.cpp index ba439a9e90..eaab792d9c 100644 --- a/resource/csdk/connectivity/test/uqueue_test.cpp +++ b/resource/csdk/connectivity/test/uqueue_test.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "uqueue.h" diff --git a/resource/csdk/logger/test/loggertests.cpp b/resource/csdk/logger/test/loggertests.cpp index 9e7b59a3b2..0a9e4bc0eb 100644 --- a/resource/csdk/logger/test/loggertests.cpp +++ b/resource/csdk/logger/test/loggertests.cpp @@ -24,7 +24,7 @@ extern "C" { } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/csdk/resource-directory/unittests/rddatabase.cpp b/resource/csdk/resource-directory/unittests/rddatabase.cpp index 36689be633..d3d89108ed 100644 --- a/resource/csdk/resource-directory/unittests/rddatabase.cpp +++ b/resource/csdk/resource-directory/unittests/rddatabase.cpp @@ -32,7 +32,7 @@ extern "C" #include "payload_logging.h" } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/csdk/resource-directory/unittests/rdtests.cpp b/resource/csdk/resource-directory/unittests/rdtests.cpp index 1ed5e3b844..b4cbf244e6 100644 --- a/resource/csdk/resource-directory/unittests/rdtests.cpp +++ b/resource/csdk/resource-directory/unittests/rdtests.cpp @@ -33,7 +33,7 @@ extern "C" #include "coap/pdu.h" } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp b/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp index f948ddf4f6..9545a8fd72 100644 --- a/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp +++ b/resource/csdk/security/provisioning/unittest/credentialgeneratortest.cpp @@ -17,7 +17,7 @@ * limitations under the License. * * *****************************************************************/ -#include "gtest/gtest.h" +#include #include "credentialgenerator.h" #include "oic_malloc.h" diff --git a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp index 51695678b4..44336b8701 100644 --- a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp +++ b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp @@ -17,7 +17,7 @@ * limitations under the License. * * *****************************************************************/ -#include "gtest/gtest.h" +#include #include "ocprovisioningmanager.h" static OicSecAcl_t acl1; diff --git a/resource/csdk/security/provisioning/unittest/otmunittest.cpp b/resource/csdk/security/provisioning/unittest/otmunittest.cpp index eac26948a3..1dde21aeba 100644 --- a/resource/csdk/security/provisioning/unittest/otmunittest.cpp +++ b/resource/csdk/security/provisioning/unittest/otmunittest.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "gtest/gtest.h" +#include #include "ocstack.h" #include "utlist.h" #include "logger.h" diff --git a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp index a2e53770d4..dafc6e8865 100644 --- a/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp +++ b/resource/csdk/security/provisioning/unittest/pmutilitytest.cpp @@ -17,7 +17,7 @@ * limitations under the License. * * *****************************************************************/ -#include "gtest/gtest.h" +#include #include "pmutility.h" #include "pmutilityinternal.h" #include "doxmresource.h" diff --git a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp index f6cd2a0af3..2af25c0202 100644 --- a/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp +++ b/resource/csdk/security/provisioning/unittest/provisioningdatabasemanager.cpp @@ -18,7 +18,7 @@ * * *****************************************************************/ #include "iotivity_config.h" -#include "gtest/gtest.h" +#include #include "provisioningdatabasemanager.h" #ifdef _MSC_VER diff --git a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp index 449f14de85..234a9a130d 100644 --- a/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp +++ b/resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp @@ -17,7 +17,7 @@ * limitations under the License. * * *****************************************************************/ -#include "gtest/gtest.h" +#include #include "secureresourceprovider.h" static OicSecAcl_t acl; diff --git a/resource/csdk/security/unittest/aclresourcetest.cpp b/resource/csdk/security/unittest/aclresourcetest.cpp index aa62c7d99c..4904136a9f 100644 --- a/resource/csdk/security/unittest/aclresourcetest.cpp +++ b/resource/csdk/security/unittest/aclresourcetest.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include #include #include "ocstack.h" diff --git a/resource/csdk/security/unittest/amaclresourcetest.cpp b/resource/csdk/security/unittest/amaclresourcetest.cpp index dbe82ff0ed..0bef64f3a8 100644 --- a/resource/csdk/security/unittest/amaclresourcetest.cpp +++ b/resource/csdk/security/unittest/amaclresourcetest.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "cainterface.h" #include "ocstack.h" #include "ocpayload.h" diff --git a/resource/csdk/security/unittest/base64tests.cpp b/resource/csdk/security/unittest/base64tests.cpp index 046c33c9b2..1ae5287ba5 100644 --- a/resource/csdk/security/unittest/base64tests.cpp +++ b/resource/csdk/security/unittest/base64tests.cpp @@ -18,7 +18,7 @@ * ******************************************************************/ -#include "gtest/gtest.h" +#include #include "base64.h" #include #include diff --git a/resource/csdk/security/unittest/credentialresource.cpp b/resource/csdk/security/unittest/credentialresource.cpp index ed53b5595a..446d9006de 100644 --- a/resource/csdk/security/unittest/credentialresource.cpp +++ b/resource/csdk/security/unittest/credentialresource.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "ocpayload.h" #include "ocstack.h" #include "oic_malloc.h" diff --git a/resource/csdk/security/unittest/crlresourcetest.cpp b/resource/csdk/security/unittest/crlresourcetest.cpp index 3ef3fead1c..bf406194ce 100644 --- a/resource/csdk/security/unittest/crlresourcetest.cpp +++ b/resource/csdk/security/unittest/crlresourcetest.cpp @@ -19,7 +19,7 @@ ******************************************************************/ #ifdef __WITH_DTLS__ -#include "gtest/gtest.h" +#include #include "logger.h" #include "ocpayload.h" #include "ocstack.h" diff --git a/resource/csdk/security/unittest/directpairingtest.cpp b/resource/csdk/security/unittest/directpairingtest.cpp index 4904b35ffa..c99b928d3e 100644 --- a/resource/csdk/security/unittest/directpairingtest.cpp +++ b/resource/csdk/security/unittest/directpairingtest.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "directpairing.h" using namespace std; diff --git a/resource/csdk/security/unittest/doxmresource.cpp b/resource/csdk/security/unittest/doxmresource.cpp index 482de2c4e6..c2855eeb5f 100644 --- a/resource/csdk/security/unittest/doxmresource.cpp +++ b/resource/csdk/security/unittest/doxmresource.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "ocstack.h" #include "ocserverrequest.h" #include "oic_string.h" diff --git a/resource/csdk/security/unittest/iotvticalendartest.cpp b/resource/csdk/security/unittest/iotvticalendartest.cpp index 80eb186849..7909b696dc 100644 --- a/resource/csdk/security/unittest/iotvticalendartest.cpp +++ b/resource/csdk/security/unittest/iotvticalendartest.cpp @@ -19,7 +19,7 @@ //Not supported on Arduino due lack of absolute time need to implement iCalendar #ifndef WITH_ARDUINO -#include "gtest/gtest.h" +#include #include "iotvticalendar.h" #include "logger.h" diff --git a/resource/csdk/security/unittest/pbkdf2tests.cpp b/resource/csdk/security/unittest/pbkdf2tests.cpp index 2b7643141d..f1b14eeb05 100644 --- a/resource/csdk/security/unittest/pbkdf2tests.cpp +++ b/resource/csdk/security/unittest/pbkdf2tests.cpp @@ -18,7 +18,7 @@ * ******************************************************************/ -#include "gtest/gtest.h" +#include #include "pbkdf2.h" #include #include diff --git a/resource/csdk/security/unittest/policyengine.cpp b/resource/csdk/security/unittest/policyengine.cpp index 37926ed173..4480af5740 100644 --- a/resource/csdk/security/unittest/policyengine.cpp +++ b/resource/csdk/security/unittest/policyengine.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "ocstack.h" #include "cainterface.h" #include "srmresourcestrings.h" diff --git a/resource/csdk/security/unittest/pstatresource.cpp b/resource/csdk/security/unittest/pstatresource.cpp index 9c96d70ae4..8fcc8329a6 100644 --- a/resource/csdk/security/unittest/pstatresource.cpp +++ b/resource/csdk/security/unittest/pstatresource.cpp @@ -22,7 +22,7 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "gtest/gtest.h" +#include #include "ocpayload.h" #include "ocstack.h" diff --git a/resource/csdk/security/unittest/securityresourcemanager.cpp b/resource/csdk/security/unittest/securityresourcemanager.cpp index 2141dd081e..17f86297b2 100644 --- a/resource/csdk/security/unittest/securityresourcemanager.cpp +++ b/resource/csdk/security/unittest/securityresourcemanager.cpp @@ -19,7 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include "iotivity_config.h" -#include "gtest/gtest.h" +#include #ifdef HAVE_PWD_H #include #endif diff --git a/resource/csdk/security/unittest/srmtestcommon.cpp b/resource/csdk/security/unittest/srmtestcommon.cpp index 7a554ea444..556dc49247 100644 --- a/resource/csdk/security/unittest/srmtestcommon.cpp +++ b/resource/csdk/security/unittest/srmtestcommon.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "oic_malloc.h" #include "ocstack.h" #include diff --git a/resource/csdk/security/unittest/srmutility.cpp b/resource/csdk/security/unittest/srmutility.cpp index 10dbabac3f..8488cc4708 100644 --- a/resource/csdk/security/unittest/srmutility.cpp +++ b/resource/csdk/security/unittest/srmutility.cpp @@ -16,7 +16,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "ocstack.h" #include "srmutility.h" #include "oic_string.h" diff --git a/resource/csdk/stack/test/cbortests.cpp b/resource/csdk/stack/test/cbortests.cpp index 7c2ecfaae0..0d00426c35 100644 --- a/resource/csdk/stack/test/cbortests.cpp +++ b/resource/csdk/stack/test/cbortests.cpp @@ -29,7 +29,7 @@ extern "C" #include "oic_malloc.h" } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/resource/csdk/stack/test/stacktests.cpp b/resource/csdk/stack/test/stacktests.cpp index 33faf9ea76..1435307204 100644 --- a/resource/csdk/stack/test/stacktests.cpp +++ b/resource/csdk/stack/test/stacktests.cpp @@ -31,7 +31,7 @@ extern "C" #include "ocresourcehandler.h" } -#include "gtest/gtest.h" +#include #include #include #include diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp index 524445d932..b8f3e38bdd 100644 --- a/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp +++ b/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp @@ -20,7 +20,7 @@ #include -#include "gtest/gtest.h" +#include #include "HippoMocks/hippomocks.h" #include "OCPlatform.h" diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp index 65646fe33a..3c2738c1b4 100644 --- a/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp +++ b/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp @@ -19,7 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include -#include "gtest/gtest.h" +#include #include "HippoMocks/hippomocks.h" #include "BrokerTypes.h" diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp index 69f16129c1..9d3f671738 100644 --- a/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp +++ b/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp @@ -17,7 +17,7 @@ // limitations under the License. // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "gtest/gtest.h" +#include #include "HippoMocks/hippomocks.h" #include "OCPlatform.h" diff --git a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp index 01998876a8..7dd992763d 100644 --- a/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp +++ b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp @@ -22,7 +22,7 @@ #include #include -#include "gtest/gtest.h" +#include #include "HippoMocks/hippomocks.h" #include "OCResource.h" -- GitLab