Removed the REAL_GMOCK define

Author: basvodde

Makefile.am

@@ -218,17 +218,17 @@ cpputest_build_gtest15:
 check_gtest15: cpputest_build_gtest15
 	@echo "Build using gmock 1.5";
 	export GMOCK_HOME=`pwd`/cpputest_build_gtest15/gmock-1.5.0; \
-	make distclean; $(srcdir)/configure CXXFLAGS=-DGTEST_USE_OWN_TR1_TUPLE=1 --enable-gmock; make check
+	make distclean; $(srcdir)/configure; make check
 
 check_gtest16: cpputest_build_gtest16
 	@echo "Build using gmock 1.6";
 	export GMOCK_HOME=`pwd`/cpputest_build_gtest16/gmock-1.6.0; \
-	make distclean; $(srcdir)/configure CXXFLAGS=-DGTEST_USE_OWN_TR1_TUPLE=1 --enable-gmock; make check
+	make distclean; $(srcdir)/configure; make check
 
 check_gtest17: cpputest_build_gtest17
 	@echo "Build using gmock 1.7"
 	export GMOCK_HOME=`pwd`/cpputest_build_gtest17/gmock-1.7.0; \
-	make distclean; $(srcdir)/configure --enable-gmock; make check
+	make distclean; $(srcdir)/configure; make check
 
 remove_gtest_directories:
 	rm -rf cpputest_build_gtest15

Makefile_using_MakefileWorker

@@ -56,10 +56,6 @@ test_all: start test_old_make
 	@echo Building with overridden CXXFLAGS and CFLAGS and memory leak and STDC++ disabled
 	$(TIME) make CLFAGS="" CXXFLAGS="" CPPFLAGS="-Iinclude -DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED"
 	make CFLAGS="" CXXFLAGS="" CPPFLAGS="-DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED" clean
-	@echo Building CppUTest with Google Mock 
-	$(SILENCE) if [ -z $$GMOCK_HOME ]; then  \
-	   echo "******** WARNING: Can't test with CPPUTEST_USE_REAL_GMOCK because can't find Google Mock -- no GMOCK_HOME set ********"; \
-	   else $(TIME) make extensions CPPUTEST_USE_REAL_GMOCK=Y; fi
 	@echo Building examples 
 	make cleanExamples
 	$(TIME) make examples

build/MakefileWorker.mk

@@ -160,14 +160,6 @@ ifndef CPPUTEST_USE_STD_CPP_LIB
 	CPPUTEST_USE_STD_CPP_LIB = Y
 endif
 
-# Use gmock
-ifdef CPPUTEST_USE_REAL_GMOCK
-	CPPUTEST_USE_REAL_GMOCK = Y
-else
-	CPPUTEST_USE_REAL_GMOCK = N
-endif
-
-
 # Use gcov, off by default
 ifndef CPPUTEST_USE_GCOV
 	CPPUTEST_USE_GCOV = N
@@ -179,7 +171,6 @@ endif
 
 # Default warnings
 ifndef CPPUTEST_WARNINGFLAGS
-ifeq ($(CPPUTEST_USE_REAL_GMOCK), N)
 	CPPUTEST_WARNINGFLAGS =  -Wall -Wextra -Werror -Wshadow -Wswitch-default -Wswitch-enum -Wconversion
 ifeq ($(CPPUTEST_PEDANTIC_ERRORS), Y)
 	CPPUTEST_WARNINGFLAGS += -pedantic-errors
@@ -190,7 +181,6 @@ endif
 	CPPUTEST_CXX_WARNINGFLAGS = -Woverloaded-virtual
 	CPPUTEST_C_WARNINGFLAGS = -Wstrict-prototypes
 endif
-endif
 
 #Wonderful extra compiler warnings with clang
 ifeq ($(COMPILER_NAME),$(CLANG_STR))
@@ -289,15 +279,13 @@ ifeq ($(CPPUTEST_USE_STD_C_LIB), Y)
 endif
 endif
 
-ifeq ($(CPPUTEST_USE_REAL_GMOCK), Y)
-	ifndef GMOCK_HOME
-$(error CPPUTEST_USE_REAL_GMOCK defined, but GMOCK_HOME not, so can't use real gmock! Please define GMOCK_HOME to the gmock location)
-	endif
+ifdef $(GMOCK_HOME)
 	GTEST_HOME = $(GMOCK_HOME)/gtest
 	CPPUTEST_CPPFLAGS += -I$(GMOCK_HOME)/include
 	GMOCK_LIBRARY = $(GMOCK_HOME)/lib/.libs/libgmock.a
 	LD_LIBRARIES += $(GMOCK_LIBRARY)
-	CPPUTEST_CPPFLAGS += -DCPPUTEST_USE_REAL_GMOCK
+	CPPUTEST_CPPFLAGS += -DINCLUDE_GTEST_TESTS
+	CPPUTEST_WARNINGFLAGS = 
 	CPPUTEST_CPPFLAGS += -I$(GTEST_HOME)/include -I$(GTEST_HOME)
 	GTEST_LIBRARY = $(GTEST_HOME)/lib/.libs/libgtest.a
 	LD_LIBRARIES += $(GTEST_LIBRARY)

cmake/Modules/CppUTestConfigurationOptions.cmake

@@ -48,7 +48,6 @@ set(GMOCK_HOME $ENV{GMOCK_HOME})
 if (DEFINED ENV{GMOCK_HOME})
 
     # GMock pulls in gtest.
-    set(CPPUTEST_USE_REAL_GMOCK 1)
     set(INCLUDE_GTEST_TESTS 1)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
     include_directories(${GMOCK_HOME}/include ${GMOCK_HOME}/gtest ${GMOCK_HOME}/gtest/include)

config.h.cmake

@@ -8,8 +8,6 @@
 #cmakedefine CPPUTEST_STD_C_LIB_DISABLED
 #cmakedefine CPPUTEST_STD_CPP_LIB_DISABLED
 
-#cmakedefine CPPUTEST_USE_REAL_GMOCK
-
 #cmakedefine INCLUDE_GTEST_TESTS
 
 #endif

configure.ac

@@ -369,7 +369,6 @@ GMOCK_HOME was set, but couldn't find the compiled library.
 Did you compile it?
 -------------------------------------]);
 	fi	
-	AC_DEFINE([CPPUTEST_USE_REAL_GMOCK], [1], [Use GMock])
 
 	# In Travis, do not show warnings. The GTest warnings cause a log overflow that errors the build. Nice :)
 	if test -n "${TRAVIS_BRANCH}"; then

include/CppUTestExt/GMock.h

@@ -28,9 +28,7 @@
 #ifndef GMOCK_H_
 #define GMOCK_H_
 
-#ifdef CPPUTEST_USE_REAL_GMOCK
 #undef new
-#endif
 
 #undef RUN_ALL_TESTS
 
@@ -40,10 +38,8 @@
 #include "gmock/gmock.h"
 #undef RUN_ALL_TESTS
 
-#ifdef CPPUTEST_USE_REAL_GMOCK
 using testing::Return;
 using testing::NiceMock;
-#endif
 
 #ifdef CPPUTEST_USE_NEW_MACROS
 #include "CppUTest/MemoryLeakDetectorNewMacros.h"

tests/CppUTestExt/TestGMock.cpp

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef CPPUTEST_USE_REAL_GMOCK
+#ifdef INCLUDE_GTEST_TESTS
 
 #include "CppUTestExt/GMock.h"
 #include "CppUTest/TestHarness.h"

tests/CppUTestExt/TestGTest.cpp

@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef CPPUTEST_USE_REAL_GMOCK
+#ifdef INCLUDE_GTEST_TESTS
 #undef new
 
 #include "gtest/gtest.h"