Merge b359a5f into 3c20848

.travis.yml

@@ -48,6 +48,8 @@ jobs:
       env: BUILD=autotools
     - compiler: clang
       env: BUILD=autotools
+    - compiler: gcc
+      env: BUILD=makefileworker
 
 # Extended builds, different C++ version and build tools
     - stage: extended build & test

ChangeLog

@@ -1,18 +1,4 @@
 
-Addition to Release 3.7 and Release 3.7.1:
-
-* -v and -ojunit together
-* Better memory leak printing
-* MEMCMP_EQUAL
-* STRNCMP_EQUAL
-* Memory Leak Detector multi-threading support
-* Mock Output parameters
-* Better Windows support
-* Many Mock improvements
-* Many small fixes and improvements
-* Less platform specific dependencies
-* More platforms supported
-
-For further changelog check the github page:
+For changelog check the github page:
 https://github.com/cpputest/cpputest
 

Makefile_using_MakefileWorker

@@ -11,12 +11,13 @@ endif
 CPPUTEST_HOME = .
 OLD_MAKE = oldmake
 
+MAKE_CMD = make -f $(CPPUTEST_HOME)/Makefile_using_MakefileWorker
 CPPUTEST_ENABLE_DEBUG = Y
 
 SRC_DIRS = \
 	src/CppUTest \
 	src/Platforms/$(CPP_PLATFORM)
-	
+
 TEST_SRC_DIRS = \
 	tests/CppUTest
 
@@ -27,75 +28,63 @@ include $(CPPUTEST_HOME)/build/MakefileWorker.mk
 
 #these are a sample of the other alternative flag settings
 .PHONY: test_all
-test_all: start test_old_make
+test_all: start
 	@echo Building with the default flags.
-	make clean
-	$(TIME) make 
+	$(MAKE_CMD) clean
+	$(TIME) $(MAKE_CMD)
 	./$(TEST_TARGET) -r
-	make clean
-	@echo Building with the STDC++ new disabled. 
-	$(TIME) make CPPUTEST_USE_STD_CPP_LIB=Y extensions 
-	make CPPUTEST_USE_STD_CPP_LIB=Y cleanExtensions
+	$(MAKE_CMD) clean
+	@echo Building with the STDC++ new disabled.
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_STD_CPP_LIB=Y extensions
+	$(MAKE_CMD) CPPUTEST_USE_STD_CPP_LIB=Y cleanExtensions
 	@echo Building with Memory Leak Detection disabled
-	$(TIME) make CPPUTEST_USE_MEM_LEAK_DETECTION=N extensions
-	make CPPUTEST_USE_MEM_LEAK_DETECTION=N cleanExtensions
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_MEM_LEAK_DETECTION=N extensions
+	$(MAKE_CMD) CPPUTEST_USE_MEM_LEAK_DETECTION=N cleanExtensions
 	@echo Building with Memory Leak Detection disabled and STD C++ disabled
-	$(TIME) make CPPUTEST_USE_MEM_LEAK_DETECTION=N CPPUTEST_USE_STD_CPP_LIB=Y extensions
-	make CPPUTEST_USE_MEM_LEAK_DETECTION=N CPPUTEST_USE_STD_CPP_LIB=Y cleanExtensions
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_MEM_LEAK_DETECTION=N CPPUTEST_USE_STD_CPP_LIB=Y extensions
+	$(MAKE_CMD) CPPUTEST_USE_MEM_LEAK_DETECTION=N CPPUTEST_USE_STD_CPP_LIB=Y cleanExtensions
 	@echo Building with debug disabled
-	$(TIME) make CPPUTEST_ENABLE_DEBUG=N extensions
-	make CPPUTEST_ENABLE_DEBUG=N cleanExtensions
+	$(TIME) $(MAKE_CMD) CPPUTEST_ENABLE_DEBUG=N extensions
+	$(MAKE_CMD) CPPUTEST_ENABLE_DEBUG=N cleanExtensions
 	@echo Building with overridden CXXFLAGS and CFLAGS and CPPFLAGS
-	$(TIME) make CLFAGS="" CXXFLAGS="" CPPFLAGS="-Iinclude"
-	make CFLAGS="" CXXFLAGS="" clean
+	$(TIME) $(MAKE_CMD) CLFAGS="" CXXFLAGS="" CPPFLAGS="-Iinclude"
+	$(MAKE_CMD) CFLAGS="" CXXFLAGS="" clean
 	@echo Building without Standard C library includes
-	$(TIME) make CPPUTEST_USE_STD_C_LIB=N all_no_tests
-	make CPPUTEST_USE_STD_C_LIB=N clean
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_STD_C_LIB=N all_no_tests
+	$(MAKE_CMD) CPPUTEST_USE_STD_C_LIB=N clean
 	@echo Building with a different TARGET_PLATFORM
-	make TARGET_PLATFORM=real_platform
+	$(MAKE_CMD) TARGET_PLATFORM=real_platform
 	@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 examples 
-	make cleanExamples
-	$(TIME) make examples
-	make cleanExamples
+	$(TIME) $(MAKE_CMD) CLFAGS="" CXXFLAGS="" CPPFLAGS="-Iinclude -DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED"
+	$(MAKE_CMD) CFLAGS="" CXXFLAGS="" CPPFLAGS="-DCPPUTEST_STD_CPP_LIB_DISABLED -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED" clean
+	@echo Building examples
+	$(MAKE_CMD) cleanExamples
+	$(TIME) $(MAKE_CMD) examples
+	$(MAKE_CMD) cleanExamples
 	@echo Testing JUnit output
-	$(TIME) make
+	$(TIME) $(MAKE_CMD)
 	$(SILENCE)./$(TEST_TARGET) -ojunit > junit_run_output
 	$(SILENCE)if [ -s junit_run_output ]; then echo "JUnit run has output. Build failed!"; exit 1; fi
-	make clean
-	make CPPUTEST_MAP_FILE=map.txt
-	make clean
+	$(MAKE_CMD) clean
+	$(MAKE_CMD) CPPUTEST_MAP_FILE=map.txt
+	$(MAKE_CMD) clean
 	@echo Testing GCOV usage
-	$(TIME) make CPPUTEST_USE_GCOV=Y everythingInstall
-	make gcov
-	make -f Makefile_CppUTestExt gcov
-	make -C examples gcov
-	make cleanEverythingInstall
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_GCOV=Y everythingInstall
+	$(MAKE_CMD) gcov
+	$(MAKE) -f Makefile_CppUTestExt gcov
+	$(MAKE) -C examples gcov
+	$(MAKE_CMD) cleanEverythingInstall
 	@echo Testing VPATH usage
-	$(TIME) make CPPUTEST_USE_GCOV=Y CPPUTEST_USE_VPATH=Y everythingInstall
-	make CPPUTEST_USE_VPATH=Y gcov
-	make CPPUTEST_USE_VPATH=Y -f Makefile_CppUTestExt gcov
-	make CPPUTEST_USE_VPATH=Y -C examples gcov	
-	make clean cleanExamples
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_GCOV=Y CPPUTEST_USE_VPATH=Y everythingInstall
+	$(MAKE_CMD) CPPUTEST_USE_VPATH=Y gcov
+	$(MAKE) CPPUTEST_USE_VPATH=Y -f Makefile_CppUTestExt gcov
+	$(MAKE) CPPUTEST_USE_VPATH=Y -C examples gcov
+	$(MAKE_CMD) clean cleanExamples
 	@echo Testing VPATH usage
-	$(TIME) make CPPUTEST_USE_VPATH=Y everythingInstall
-	make CPPUTEST_USE_VPATH=Y cleanEverythingInstall
-	make flags
-	make debug
-
-HAS_OLD_MAKE = $(shell $(OLD_MAKE) -v 2>/dev/null)
-
-test_old_make:
-	$(SILENCE)if [ "$(HAS_OLD_MAKE)" = "" ]; then \
-		echo "Old make with the name $(OLD_MAKE) not found. Skipping testing with old make version"; \
-	else \
-		$(OLD_MAKE) -f Makefile_for_old_make clean && \
-		$(OLD_MAKE) -f Makefile_for_old_make && \
-		$(OLD_MAKE) -f Makefile_for_old_make extensions && \
-		$(OLD_MAKE) -f Makefile_for_old_make clean; \
-	fi
+	$(TIME) $(MAKE_CMD) CPPUTEST_USE_VPATH=Y everythingInstall
+	$(MAKE_CMD) CPPUTEST_USE_VPATH=Y cleanEverythingInstall
+	$(MAKE_CMD) flags
+	$(MAKE_CMD) debug
 
 .PHONY: examples
 examples: $(TEST_TARGET) extensions

scripts/travis_ci_build.sh

@@ -12,6 +12,10 @@ if [ "x$BUILD" = "xautotools" ]; then
     make tdd
 fi
 
+if [ "x$BUILD" = "xmakefileworker" ]; then
+    make -C $CPPUTEST_HOME -f Makefile_using_MakefileWorker
+fi
+
 if [ "x$BUILD" = "xcmake" ]; then
     BUILD_ARGS=("-DWERROR=ON")
 

src/Platforms/GccNoStdC/UtestPlatform.cpp

@@ -78,3 +78,5 @@ void (*PlatformSpecificMutexLock)(PlatformSpecificMutex mtx) = NULLPTR;
 void (*PlatformSpecificMutexUnlock)(PlatformSpecificMutex mtx) = NULLPTR;
 void (*PlatformSpecificMutexDestroy)(PlatformSpecificMutex mtx) = NULLPTR;
 
+void (*PlatformSpecificSrand)(unsigned int) = NULLPTR;
+int (*PlatformSpecificRand)(void) = NULLPTR;

tests/CppUTest/MemoryOperatorOverloadTest.cpp

@@ -166,9 +166,16 @@ TEST(MemoryLeakOverridesToBeUsedInProductionCode, UseNativeMallocByTemporarlySwi
     #undef malloc
     #undef free
 #endif
+
+#if CPPUTEST_USE_STD_C_LIB
     void* memory = malloc(10);
     LONGS_EQUAL(memLeaks, memLeakDetector->totalMemoryLeaks(mem_leak_period_checking));
     free (memory);
+#else
+    void* memory = PlatformSpecificMalloc(10);
+    LONGS_EQUAL(memLeaks, memLeakDetector->totalMemoryLeaks(mem_leak_period_checking));
+    PlatformSpecificFree (memory);
+#endif
 
 #ifdef CPPUTEST_USE_MALLOC_MACROS
 #include "CppUTest/MemoryLeakDetectorMallocMacros.h"

tests/CppUTest/SimpleStringTest.cpp

@@ -532,10 +532,10 @@ TEST(SimpleString, copyInBufferNormal)
 {
     SimpleString str("Hello World");
     size_t bufferSize = str.size()+1;
-    char* buffer = (char*) malloc(bufferSize);
+    char* buffer = (char*) PlatformSpecificMalloc(bufferSize);
     str.copyToBuffer(buffer, bufferSize);
     STRCMP_EQUAL(str.asCharString(), buffer);
-    free(buffer);
+    PlatformSpecificFree(buffer);
 }
 
 TEST(SimpleString, copyInBufferWithEmptyBuffer)
@@ -550,21 +550,21 @@ TEST(SimpleString, copyInBufferWithBiggerBufferThanNeeded)
 {
     SimpleString str("Hello");
     size_t bufferSize = 20;
-    char* buffer= (char*) malloc(bufferSize);
+    char* buffer= (char*) PlatformSpecificMalloc(bufferSize);
     str.copyToBuffer(buffer, bufferSize);
     STRCMP_EQUAL(str.asCharString(), buffer);
-    free(buffer);
+    PlatformSpecificFree(buffer);
 }
 
 TEST(SimpleString, copyInBufferWithSmallerBufferThanNeeded)
 {
     SimpleString str("Hello");
     size_t bufferSize = str.size();
-    char* buffer= (char*) malloc(bufferSize);
+    char* buffer= (char*) PlatformSpecificMalloc(bufferSize);
     str.copyToBuffer(buffer, bufferSize);
     STRNCMP_EQUAL(str.asCharString(), buffer, (bufferSize-1));
     LONGS_EQUAL(0, buffer[bufferSize-1]);
-    free(buffer);
+    PlatformSpecificFree(buffer);
 }
 
 TEST(SimpleString, ContainsNull)

tests/CppUTest/TestHarness_cTest.cpp

@@ -338,7 +338,7 @@ TEST(TestHarness_c, checkLongLongInt)
 static void _failLongLongIntTextMethod()
 {
     cpputest_longlong dummy_longlong;
-    CHECK_EQUAL_C_LONGLONG_TEXT(dummy_longlong, dummy_longlong);
+    CHECK_EQUAL_C_LONGLONG_TEXT(dummy_longlong, dummy_longlong, "Text");
 } // LCOV_EXCL_LINE
 
 TEST(TestHarness_c, checkLongLongIntText)
@@ -366,7 +366,7 @@ TEST(TestHarness_c, checkUnsignedLongLongInt)
 static void _failUnsignedLongLongIntTextMethod()
 {
     cpputest_ulonglong dummy_ulonglong;
-    CHECK_EQUAL_C_ULONGLONG_TEXT(dummy_ulonglong, dummy_ulonglong);
+    CHECK_EQUAL_C_ULONGLONG_TEXT(dummy_ulonglong, dummy_ulonglong, "Text");
 } // LCOV_EXCL_LINE
 
 TEST(TestHarness_c, checkUnsignedLongLongIntText)