Merge 15da7e5 into eb4992f

.github/actions/update-ghpages/entrypoint.sh

@@ -2,6 +2,8 @@
 
 set -eu
 
+BASEDIR=$(dirname $0)
+
 if [ -z "${GITHUB_SHA+x}" ]; then
   GITHUB_SHA=$(git rev-parse HEAD)
   export GITHUB_SHA
@@ -28,6 +30,10 @@ fi
 
 echo ${DIRNAME}
 
+#
+# documents
+#
+
 doxygen --version
 dot -V || true
 
@@ -55,7 +61,17 @@ if [ "${DIRNAME}" = 'master' ]; then
   make gh-pages-for-master
 fi
 
-cd gh-pages
+#
+# cppcheck
+#
+
+cd ${BASEDIR}
+make -C test/cppcheck html HTML_REPORT_DIR=${BASEDIR}/docs/gh-pages/${DIRNAME}/cppcheck
+
+#
+# commit
+# 
+cd ${BASEDIR}/docs/gh-pages
 
 if [ -n "${INPUT_GITHUB_TOKEN+x}" ]; then
   if [ -z "${INPUT_GITHUB_EMAIL+x}" ]; then

include/impl/iutest_port.ipp

@@ -82,7 +82,7 @@ IUTEST_IPP_INLINE const char* GetEnv(const char* name)
     || defined(IUTEST_OS_WINDOWS_PHONE) || defined(IUTEST_OS_WINDOWS_RT) || defined(IUTEST_OS_WINDOWS_MOBILE)
     IUTEST_UNUSED_VAR(name);
     return NULL;
-#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9)
+#elif defined(__BORLANDC__) || defined(__SunOS)
     const char* env = getenv(name);
     return (env != NULL && env[0] != '\0') ? env : NULL;
 #else

test/cppcheck/.gitignore

@@ -0,0 +1,2 @@
+*.xml
+.DS_Store

test/cppcheck/Config.mk

@@ -0,0 +1,99 @@
+# Copyright (C) 2021, Takazumi Shirayanagi
+# This software is released under the new BSD License,
+# see LICENSE
+
+CPPCHECK_DEFINES= \
+	IUTEST_HAS_CLOCK=1 \
+	IUTEST_MAX_PATH=260 \
+
+CPPCHECK_UNDEFINES= \
+	__WIN32__ \
+	_WIN32 \
+	_MSC_VER \
+	_MSC_FULL_VER \
+	WINAPI_FAMILY \
+	WINAPI_FAMILY_PHONE_APP \
+	WIN32_LEAN_AND_MEAN \
+	_NATIVE_WCHAR_T_DEFINED \
+	__AFX_H__ \
+	__clang__ \
+	__clang_analyzer__ \
+	IUTEST_CLANG_MAJOR \
+	IUTEST_CLANG_MINOR \
+	__CYGWIN__ \
+	__APPLE__ \
+	__ppc__ \
+	__ppc64__ \
+	ANDROID \
+	__ANDROID__ \
+	__CUDACC__ \
+	__INTEL_COMPILER \
+	COMPILER_ICC \
+	__BORLANDC__ \
+	__MWERKS__ \
+	__MINGW32__ \
+	__MINGW64__ \
+	__MINGW__ \
+	__AVR32__ \
+	__avr32__ \
+	__arm__ \
+	__ARMCC_VERSION \
+	_XOPEN_SOURCE \
+	_BSD_SOURCE \
+	_POSIX_C_SOURCE \
+	sun \
+	__sun \
+	__SunOS \
+	__native_client__ \
+	__SGI_STL_PORT \
+	_STLPORT_VERSION \
+	_STLP_LONG_LONG \
+	__USE_MINGW_ANSI_STDIO \
+	__MAC_OS_X_VERSION_MIN_REQUIRED \
+	__STDC_WANT_SECURE_LIB__ \
+	IUTEST_BUILD_DOXYGEN \
+	IUTEST_OS_WINDOWS_MINGW \
+	IUTEST_OS_FREEBSD \
+	IUTEST_OS_LINUX_ANDROID \
+	IUTEST_OS_NACL \
+	IUTEST_COND_UNLIKELY \
+	IUTEST_ATTRIBUTE_LIKELY_ \
+	IUTEST_ATTRIBUTE_UNLIKELY_ \
+	IUTEST_ATTRIBUTE_INIT_PRIORITY_ \
+	IUTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS \
+	IUTEST_ATTRIBUTE_NO_SANITIZE_MEMORY \
+	IUTEST_ATTRIBUTE_NO_SANITIZE_THREAD \
+	IUTEST_HAS_ATTRIBUTE_DEPRECATED \
+	__WANDBOX__ \
+	GTEST_OS_SOLARIS \
+	GTEST_OS_WINDOWS \
+	GTEST_OS_WINDOWS_MINGW \
+
+	# IUTEST_USE_GTEST \
+
+
+# C++20
+
+CPPCHECK_DEFINES+= \
+	IUTEST_CPLUSPLUS=202002L
+
+# gtest
+CPPCHECK_DEFINES+= \
+	GTEST_MAJORVER=0x01 \
+	GTEST_MINORVER=0x10	\
+	GTEST_MICROVER=0x00	\
+	GTEST_REVISION=0x00	\
+	GTEST_BUILD=0x00	\
+	GTEST_LATEST=0		\
+
+CPPCHECK_UNDEFINES+= \
+	IUTEST_USE_GTEST
+
+
+# suppress check
+CPPCHECK_SUPPRESS= \
+	syntaxError \
+	missingIncludeSystem \
+	ConfigurationNotChecked \
+	knownConditionTrueFalse:*/iutest_internal_defs.hpp \
+	unmatchedSuppression

test/cppcheck/Makefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2018, Takazumi Shirayanagi
+# Copyright (C) 2018-2021, Takazumi Shirayanagi
 # This software is released under the new BSD License,
 # see LICENSE
 
@@ -19,30 +19,22 @@ IUTEST_HEADERS =$(IUTEST_DIR)/include/*.hpp \
 # cppcheck configuration
 #
 
-CPPCHECK_DEFINES= \
-	IUTEST_HAS_CLOCK=1 \
-
-CPPCHECK_UNDEFINES= \
-	_WIN32 \
-	_MSC_VER \
-	__clang__ \
-	__CYGWIN__ \
-	__APPLE__ \
-
-CPPCHECK_SUPPRESS= \
-	syntaxError \
-	missingIncludeSystem \
-	ConfigurationNotChecked \
-	knownConditionTrueFalse:*/iutest_internal_defs.hpp \
-	unmatchedSuppression
+include Config.mk
 
 CPPCHECK_DEFINES_OPTIONS=$(patsubst %,-D%,$(CPPCHECK_DEFINES))
 CPPCHECK_UNDEFINES_OPTIONS=$(patsubst %,-U%,$(CPPCHECK_UNDEFINES))
 CPPCHECK_SUPPRESS_OPTIONS=$(patsubst %,--suppress=%,$(CPPCHECK_SUPPRESS))
 
 CPPCHECK_ENABLE_OPTION= --enable=all
 
-DEFAULT_OPTIONS=--inline-suppr -f -j4 --platform=unix64
+DEFAULT_OPTIONS=--inline-suppr -j8 --platform=unix64
+
+ifdef FULL
+DEFAULT_OPTIONS+= -f
+endif
+ifdef USE_CLANG
+DEFAULT_OPTIONS+= --clang
+endif
 
 OPTIONS+= $(DEFAULT_OPTIONS)
 OPTIONS+= $(CPPCHECK_ENABLE_OPTION)
@@ -72,7 +64,7 @@ default: version $(TARGETS)
 all: clean default
 
 clean:
-	$(RM) $(TARGETS) check-config.xml
+	$(RM) $(TARGETS) check-config.xml ./html
 
 version:
 	cppcheck --version
@@ -82,3 +74,9 @@ check-config:
 
 $(TARGETS): $(SRC_CPP) Makefile
 	cppcheck $(IUTEST_INCLUDE) $(OPTIONS) $(SRCS) --xml 2> $@
+
+HTML_REPORT_DIR:=./html
+html: $(TARGETS)
+	@if [ ! -e ${HTML_REPORT_DIR} ]; then mkdir -p ${HTML_REPORT_DIR}; fi
+	cppcheck-htmlreport --file=$< --title=iutest --report-dir=${HTML_REPORT_DIR}
+	# cppcheck-htmlreport --file=$< --title=iutest --report-dir=./html --source-dir=$(IUTEST_DIR)/include