Merge 686544a into bcabc12

cpputest · Apr 27, 2016 · d7e1cee · d7e1cee
2 parents bcabc12 + 686544a
commit d7e1cee
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 45 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -203,6 +203,10 @@ CppUTestExtTests_SOURCES = \
 	tests/CppUTestExt/MockReturnValueTest.cpp \
 	tests/CppUTestExt/OrderedTestTest.cpp
 
+DISTCLEANFILES = \
+	filename.map.txt \
+	generated/CppUTestGeneratedConfig.h
+
 if INCLUDE_GMOCKTESTS
 
 #GTestTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
@@ -347,7 +351,7 @@ check_examples:
 	$(MAKE) -C $(srcdir)/examples all clean
 
 	@echo "Compiling and running the examples. This will use the old Makefile"
-	make distclean; $(srcdir)/configure --disable-longlong; make; $(MAKE) -C $(srcdir)/examples all clean CPPUTEST_LIB_LINK_DIR="`pwd`/lib"
+	make distclean; $(srcdir)/configure; make; $(MAKE) -C $(srcdir)/examples all clean CPPUTEST_LIB_LINK_DIR="`pwd`/lib"
 
 check_all: check_basic check_special_situations check_coverage remove_coverage_output check_examples check_gtest
 	@echo "Last... one normal build and test"
@@ -371,3 +375,6 @@ dist-hook:
 		fi \
 	fi
 
+distclean-local:
+	test -z "generated" || rmdir generated
+
diff --git a/build/MakefileWorker.mk b/build/MakefileWorker.mk
@@ -194,7 +194,8 @@ ifeq ($(COMPILER_NAME),$(CLANG_STR))
 # -Wno-global-constructors Wno-exit-time-destructors -> Great warnings, but in CppUTest it is impossible to avoid as the automatic test registration depends on the global ctor and dtor
 # -Wno-weak-vtables -> The TEST_GROUP macro declares a class and will automatically inline its methods. Thats ok as they are only in one translation unit. Unfortunately, the warning can't detect that, so it must be disabled.
 # -Wno-old-style-casts -> We only use old style casts by decision
-	CPPUTEST_CXX_WARNINGFLAGS += -Weverything -Wno-disabled-macro-expansion -Wno-padded -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables -Wno-old-style-cast
+# -Wno-c++11-long-long -> When it detects long long, then we can use it and no need for a warning about that
+	CPPUTEST_CXX_WARNINGFLAGS += -Weverything -Wno-disabled-macro-expansion -Wno-padded -Wno-global-constructors -Wno-exit-time-destructors -Wno-weak-vtables -Wno-old-style-cast -Wno-c++11-long-long
 	CPPUTEST_C_WARNINGFLAGS += -Weverything -Wno-padded
 
 # Clang "7" (Xcode 7 command-line tools) introduced new warnings by default that don't exist on previous versions of clang and cause errors when present.

diff --git a/cmake/Modules/CppUTestWarningFlags.cmake b/cmake/Modules/CppUTestWarningFlags.cmake
@@ -23,6 +23,10 @@ else (MSVC)
       endforeach (flag)
     endmacro(check_and_append_cxx_warning_flags)
 
+    if (NOT GMOCK AND NOT REAL_GTEST)
+      list(APPEND WARNING_C_FLAGS Werror pedantic-errors)
+    endif (NOT GMOCK AND NOT REAL_GTEST)
+
     set(WARNING_C_FLAGS
         Weverything
         Wall
@@ -36,13 +40,9 @@ else (MSVC)
         Wno-disabled-macro-expansion
         Wno-reserved-id-macro
         Wno-keyword-macro
-	Wno-long-long
+        Wno-long-long
         )
 
-    if (NOT GMOCK AND NOT REAL_GTEST)
-      list(APPEND WARNING_C_FLAGS Werror pedantic-errors)
-    endif (NOT GMOCK AND NOT REAL_GTEST)
-
     set(WARNING_C_ONLY_FLAGS
         Wstrict-prototypes
         )
@@ -62,8 +62,12 @@ else (MSVC)
 
     if (C++11)
         check_cxx_compiler_flag("-Wno-c++98-compat" NO_WARNING_CXX_98_COMPAT_FLAG)
+        check_cxx_compiler_flag("-Wno-c++98-compat-pedantic" NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
         if (NO_WARNING_CXX_98_COMPAT_FLAG)
             set(CPPUTEST_CXX_WARNING_FLAGS "${CPPUTEST_CXX_WARNING_FLAGS} -Wno-c++98-compat")
         endif (NO_WARNING_CXX_98_COMPAT_FLAG)
+        if (NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
+            set(CPPUTEST_CXX_WARNING_FLAGS "${CPPUTEST_CXX_WARNING_FLAGS} -Wno-c++98-compat-pedantic")
+        endif (NO_WARNING_CXX_98_COMPAT_PEDANTIC_FLAG)
     endif (C++11)
 endif (MSVC)
diff --git a/configure.ac b/configure.ac
@@ -81,18 +81,50 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNIN
 CFLAGS="$saved_cflags"
 fi
 
-# FLag -Weverything.
-CFLAGS="-Werror -Weverything -Wno-unused-macros"
-AC_MSG_CHECKING([whether CC and CXX supports -Weverything])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Weverything"; CPPUTEST_CXXWARNINGFLAGS="${CPPUTEST_CXXWARNINGFLAGS} -Weverything" ], [AC_MSG_RESULT([no])])
-CFLAGS="$saved_cflags"
+#####################################################################################
+##### C++ 11 checks
+
+### Checking for Standard C++ 11 compiler flags
+AC_LANG_PUSH([C++])
+
+# FLag -std=c++0x
+CXXFLAGS="-std=c++0x"
+AC_MSG_CHECKING([whether CXX supports -std=c++0x])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="-std=c++0x" ], [AC_MSG_RESULT([no])])
+CXXFLAGS="$saved_cxxflags"
+
+CXXFLAGS="-std=c++11"
+AC_MSG_CHECKING([whether CXX supports -std=c++11])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="-std=c++11" ], [AC_MSG_RESULT([no])])
+CXXFLAGS="$saved_cxxflags"
+
+CXXFLAGS="-stdlib=libc++"
+AC_MSG_CHECKING([whether CXX supports -stdlib=libc++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cstdio>]])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="${CPPUTEST_CPP11FLAG} -stdlib=libc++" ], [AC_MSG_RESULT([no])])
+CXXFLAGS="$saved_cxxflags"
+
+AC_LANG_POP
 
 # Flag -Wno-c++98-compat
 CXXFLAGS="-Wno-c++98-compat"
 AC_MSG_CHECKING([whether CXX supports -Wno-c++98-compat])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11BLACKLIST=" -Wno-c++98-compat" ], [AC_MSG_RESULT([no])])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11BLACKLIST="${CPPUTEST_CPP11BLACKLIST} -Wno-c++98-compat" ], [AC_MSG_RESULT([no])])
+CXXFLAGS="$saved_cxxflags"
+
+# Flag -Wno-c++98-compat-pedantic
+CXXFLAGS="-Wno-c++98-compat-pedantic"
+AC_MSG_CHECKING([whether CXX supports -Wno-c++98-compat-pedantic])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11BLACKLIST="${CPPUTEST_CPP11BLACKLIST} -Wno-c++98-compat-pedantic" ], [AC_MSG_RESULT([no])])
 CXXFLAGS="$saved_cxxflags"
 
+#####################################################################################
+##### More of these warnings
+# FLag -Weverything.
+CFLAGS="-Werror -Weverything -Wno-unused-macros"
+AC_MSG_CHECKING([whether CC and CXX supports -Weverything])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Weverything"; CPPUTEST_CXXWARNINGFLAGS="${CPPUTEST_CXXWARNINGFLAGS} -Weverything" ], [AC_MSG_RESULT([no])])
+CFLAGS="$saved_cflags"
+
 # FLag -Wall.
 CFLAGS="-Werror -Wall"
 AC_MSG_CHECKING([whether CC and CXX supports -Wall])
@@ -163,6 +195,10 @@ AC_MSG_CHECKING([whether CC supports -Wstrict-prototypes])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Wstrict-prototypes" ], [AC_MSG_RESULT([no])])
 CFLAGS="$saved_cflags"
 
+
+#####################################################################################
+##### Less of these warnings
+#
 # Disable some warnings as CppUTest has this and can't be prevented at the moment.
 # FLag -Wno-disabled-macro-expansion.
 CFLAGS="-Werror -Wno-disabled-macro-expansion"
@@ -188,11 +224,11 @@ AC_MSG_CHECKING([whether CC and CXX supports -Wno-keyword-macro])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Wno-keyword-macro"; CPPUTEST_CXXWARNINGFLAGS="${CPPUTEST_CXXWARNINGFLAGS} -Wno-keyword-macro" ], [AC_MSG_RESULT([no])])
 CFLAGS="$saved_cflags"
 
-# FLag -Wno-long-long.
-CXXFLAGS="-Werror -Wno-long-long"
-AC_MSG_CHECKING([whether CC and CXX supports -Wno-long-long])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Wno-long-long"; CPPUTEST_CXXWARNINGFLAGS="${CPPUTEST_CXXWARNINGFLAGS} -Wno-long-long" ], [AC_MSG_RESULT([no])])
-CFLAGS="$saved_cflags"
+# FLag -Wno-c++11-long-long
+CXXFLAGS="-Werror -Wno-c++11-long-long"
+AC_MSG_CHECKING([whether CC and CXX supports -Wno-c++11-long-long])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CWARNINGFLAGS="${CPPUTEST_CWARNINGFLAGS} -Wno-c++11-long-long"; CPPUTEST_CXXWARNINGFLAGS="${CPPUTEST_CXXWARNINGFLAGS} -Wno-c++11-long-long" ], [AC_MSG_RESULT([no])])
+#CFLAGS="$saved_cflags"
 
 # FLag -Wno-global-constructors.
 AC_LANG_PUSH([C++])
@@ -226,6 +262,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CXXWARN
 CXXFLAGS="$saved_cxxflags"
 AC_LANG_POP
 
+#####################################################
+######## End warning section
+
 # FLag --coverage
 AC_LANG_PUSH([C++])
 CXXFLAGS="-Werror --coverage"
@@ -234,29 +273,10 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); coverage_flag_suppo
 CXXFLAGS="$saved_cxxflags"
 AC_LANG_POP
 
-### Checking for Standard C++ 11 compiler flags
-AC_LANG_PUSH([C++])
-
-# FLag -std=c++0x
-CXXFLAGS="-std=c++0x"
-AC_MSG_CHECKING([whether CXX supports -std=c++0x])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="-std=c++0x" ], [AC_MSG_RESULT([no])])
-CXXFLAGS="$saved_cxxflags"
-
-CXXFLAGS="-std=c++11"
-AC_MSG_CHECKING([whether CXX supports -std=c++11])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="-std=c++11" ], [AC_MSG_RESULT([no])])
-CXXFLAGS="$saved_cxxflags"
-
-CXXFLAGS="-stdlib=libc++"
-AC_MSG_CHECKING([whether CXX supports -stdlib=libc++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cstdio>]])], [AC_MSG_RESULT([yes]); CPPUTEST_CPP11FLAG="${CPPUTEST_CPP11FLAG} -stdlib=libc++" ], [AC_MSG_RESULT([no])])
-CXXFLAGS="$saved_cxxflags"
-
-AC_LANG_POP
-
-### Checking for strange exception handling behavior, related to bugs in compilers...
-### TODO: This part isn't finished yet. It will need to generate different CppUTestConfig.h files based on the result of these checks.
+######################################################
+# Exception Handling
+#
+# Checking for strange exception handling behavior, related to bugs in compilers...
 AC_LANG_PUSH([C++])
 
 # Can we use operator delete without exception handling specifier? (clang warns on this!)
@@ -271,6 +291,12 @@ AC_MSG_CHECKING([whether CXX supports operator new with exception handling speci
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <new>\nvoid* operator new(size_t size) throw(std::bad_alloc);;])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); UT_NEW_CANT_HAVE_EXCEPTION_SPECIFIER="yes"])
 CXXFLAGS="$saved_cxxflags"
 
+# FLag -Wno-missing-exception-spec
+CXXFLAGS="-Werror -Wno-missing-exception-spec"
+AC_MSG_CHECKING([whether CXX supports -Wno-missing-exception-spec])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); CPPUTEST_CXX_NO_INC_WARNINGFLAGS="${CPPUTEST_CXX_NO_INC_WARNINGFLAGS} -Wno-missing-exception-spec" ], [AC_MSG_RESULT([no])])
+CXXFLAGS="$saved_cxxflags"
+
 AC_LANG_POP
 
 ##### Linker checking.
@@ -347,7 +373,7 @@ fi
 if test "x${use_std_cpp}" = xno; then
 	AC_DEFINE([STD_CPP_LIB_DISABLED], 1, [Standard C++ library disabled])
 	if test "x${use_std_c}" = xyes; then
-    	CPPUTEST_CXXFLAGS="${CPPUTEST_CXXFLAGS} -nostdinc++"
+    	CPPUTEST_CXXFLAGS="${CPPUTEST_CXXFLAGS} -nostdinc++ ${CPPUTEST_CXX_NO_INC_WARNINGFLAGS}"
 
     	# Since automake passes the CXXFLAGS to the linker, this will cause warnings with clang 3.2 (which become errors)
     	CPPUTEST_LDFLAGS="${CPPUTEST_LDFLAGS} ${CPPUTEST_NO_UNUSED_ARGUMENT_WARNING}"

diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h
@@ -201,12 +201,21 @@
 #endif
 
 /*
- * Support for "long long" type
+ * Support for "long long" type.
+ *
+ * Not supported when CPUTEST_LONG_LONG_DISABLED is set.
+ * Can be overridden by using CPPUTEST_USE_LONG_LONG
+ *
+ * CPPUTEST_HAVE_LONG_LONG_INT is set by configure
+ * LLONG_MAX is set in limits.h. This is a crude attempt to detect long long support when no configure is used
+ *
  */
 
-#if defined(CPPUTEST_HAVE_LONG_LONG_INT) && !defined(CPPUTEST_LONG_LONG_DISABLED) && !defined(CPPUTEST_USE_LONG_LONG)
+#if !defined(CPPUTEST_LONG_LONG_DISABLED) && !defined(CPPUTEST_USE_LONG_LONG)
+#if defined(CPPUTEST_HAVE_LONG_LONG_INT) || defined(LLONG_MAX)
 #define CPPUTEST_USE_LONG_LONG 1
 #endif
+#endif
 
 #ifdef CPPUTEST_USE_LONG_LONG
 typedef long long cpputest_longlong;

diff --git a/include/CppUTest/StandardCLibrary.h b/include/CppUTest/StandardCLibrary.h
@@ -1,8 +1,10 @@
 
+/* Must include this first to ensure the StandardC include in CppUTestConfig still happens at the right moment */
+#include "CppUTestConfig.h"
+
 #ifndef STANDARDCLIBRARY_H_
 #define STANDARDCLIBRARY_H_
 
-#include "CppUTestConfig.h"
 
 #if CPPUTEST_USE_STD_C_LIB