From 6ba5f70f998735d9ac4ffe834f83f028b98f8a16 Mon Sep 17 00:00:00 2001 From: Elias Kosunen Date: Sat, 26 May 2018 22:04:06 +0300 Subject: [PATCH] Enable pedantic warnings on tests --- .ropeproject/config.py | 103 +++++++++++++++++++ .ropeproject/globalnames | Bin 0 -> 1713 bytes .ropeproject/history | Bin 0 -> 14 bytes .ropeproject/objectdb | Bin 0 -> 379 bytes CMakeLists.txt | 54 +++++----- include/fmt/core.h | 6 ++ include/fmt/format.h | 8 +- include/fmt/ranges.h | 8 +- support/cmake/cxx14.cmake | 114 +++++++++++----------- support/travis-build.py | 21 ++-- test/CMakeLists.txt | 27 ++++- test/add-subdirectory-test/CMakeLists.txt | 6 +- test/assert-test.cc | 2 +- test/compile-test/CMakeLists.txt | 5 +- test/custom-formatter-test.cc | 12 ++- test/find-package-test/CMakeLists.txt | 6 +- test/format-impl-test.cc | 6 +- test/format-test.cc | 31 +++--- test/gmock-gtest-all.cc | 2 +- test/gmock/gmock.h | 2 +- test/gtest-extra-test.cc | 8 +- test/gtest-extra.cc | 2 +- test/gtest-extra.h | 4 +- test/mock-allocator.h | 6 +- test/ostream-test.cc | 16 +-- test/posix-mock-test.cc | 25 ++--- test/posix-test.cc | 34 +++---- test/printf-test.cc | 18 ++-- test/ranges-test.cc | 2 +- test/test-main.cc | 2 +- test/time-test.cc | 10 +- test/util-test.cc | 48 ++++----- test/util.h | 2 +- 33 files changed, 370 insertions(+), 220 deletions(-) create mode 100644 .ropeproject/config.py create mode 100644 .ropeproject/globalnames create mode 100644 .ropeproject/history create mode 100644 .ropeproject/objectdb diff --git a/.ropeproject/config.py b/.ropeproject/config.py new file mode 100644 index 00000000..45e1fb46 --- /dev/null +++ b/.ropeproject/config.py @@ -0,0 +1,103 @@ +# The default ``config.py`` +# flake8: noqa + + +def set_prefs(prefs): + """This function is called before opening the project""" + + # Specify which files and folders to ignore in the project. + # Changes to ignored resources are not added to the history and + # VCSs. Also they are not returned in `Project.get_files()`. + # Note that ``?`` and ``*`` match all characters but slashes. + # '*.pyc': matches 'test.pyc' and 'pkg/test.pyc' + # 'mod*.pyc': matches 'test/mod1.pyc' but not 'mod/1.pyc' + # '.svn': matches 'pkg/.svn' and all of its children + # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o' + # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o' + prefs['ignored_resources'] = [ + '*.pyc', '*~', '.ropeproject', '.hg', '.svn', '_svn', + '.git', '.tox', '.env', 'env', 'venv', 'node_modules', + 'bower_components' + ] + + # Specifies which files should be considered python files. It is + # useful when you have scripts inside your project. Only files + # ending with ``.py`` are considered to be python files by + # default. + #prefs['python_files'] = ['*.py'] + + # Custom source folders: By default rope searches the project + # for finding source folders (folders that should be searched + # for finding modules). You can add paths to that list. Note + # that rope guesses project source folders correctly most of the + # time; use this if you have any problems. + # The folders should be relative to project root and use '/' for + # separating folders regardless of the platform rope is running on. + # 'src/my_source_folder' for instance. + #prefs.add('source_folders', 'src') + + # You can extend python path for looking up modules + #prefs.add('python_path', '~/python/') + + # Should rope save object information or not. + prefs['save_objectdb'] = True + prefs['compress_objectdb'] = False + + # If `True`, rope analyzes each module when it is being saved. + prefs['automatic_soa'] = True + # The depth of calls to follow in static object analysis + prefs['soa_followed_calls'] = 0 + + # If `False` when running modules or unit tests "dynamic object + # analysis" is turned off. This makes them much faster. + prefs['perform_doa'] = True + + # Rope can check the validity of its object DB when running. + prefs['validate_objectdb'] = True + + # How many undos to hold? + prefs['max_history_items'] = 32 + + # Shows whether to save history across sessions. + prefs['save_history'] = True + prefs['compress_history'] = False + + # Set the number spaces used for indenting. According to + # :PEP:`8`, it is best to use 4 spaces. Since most of rope's + # unit-tests use 4 spaces it is more reliable, too. + prefs['indent_size'] = 4 + + # Builtin and c-extension modules that are allowed to be imported + # and inspected by rope. + prefs['extension_modules'] = [] + + # Add all standard c-extensions to extension_modules list. + prefs['import_dynload_stdmods'] = True + + # If `True` modules with syntax errors are considered to be empty. + # The default value is `False`; When `False` syntax errors raise + # `rope.base.exceptions.ModuleSyntaxError` exception. + prefs['ignore_syntax_errors'] = False + + # If `True`, rope ignores unresolvable imports. Otherwise, they + # appear in the importing namespace. + prefs['ignore_bad_imports'] = False + + # If `True`, rope will insert new module imports as + # `from import ` by default. + prefs['prefer_module_from_imports'] = False + + # If `True`, rope will transform a comma list of imports into + # multiple separate import statements when organizing + # imports. + prefs['split_imports'] = False + + # If `True`, rope will sort imports alphabetically by module name + # instead of alphabetically by import statement, with from imports + # after normal imports. + prefs['sort_imports_alphabetically'] = False + + +def project_opened(project): + """This function is called after opening the project""" + # Do whatever you like here! diff --git a/.ropeproject/globalnames b/.ropeproject/globalnames new file mode 100644 index 0000000000000000000000000000000000000000..e4e1c7fb787349708ddb0aa854a5dd73c28e276e GIT binary patch literal 1713 zcmYjRX?NT-6iw58FLYsF%VMA@Z7KUw+9tF>LP{E_SO%l9pFK)!Nl%i~3FmMQKb`06 zNiv^oz4hMvp7h`1zr2vCV+#ulr7N6Id}zdrnYt*3Wf)eqtvg-QN(e6SVRdTXvobY_ zkEr8fc%)OJVEL#zDW?>)jg<>6A5*90yh^&-i#V>%isha}6q7yM33WnjcSGH^WD}o6 z$@{KtwJrG+z^(gaoaNJq+#v2uppwtvIQVqKXVrPBGaTdNi3_Rd5}yO6bxZ4E%?0A~ zD7a$MgaTi{Vbg7sjrH}X!%UK>V zUzrQg$+i64ydl&({Jc81->IZZca8LVVXjxC0t&ncNWHka$-5|n;g`UHrXqXfm(>v| zv}}sRufRSV>#GDu;cUgPjrjEp2wELwZn?zp8!${#+vK85OZ+C(JTT-!cfwZ*RYOd- z+LGTI@!J_tnwZxjX*bRTRs0T$ZT5T62;so*Vp40%PlAz#oMFTQW`{!J_efn4(48-J zqNT!#(WKp_F_whiAMpp7IxGPXWZ$mguQY*|@Fz|AIv}|&c^UVI13=lGUYi>uzL`y~ zLEWMuZS!J6#kR!qEo5zU)(W7H)CFl!1QG=KxHCfH5r3Nje`r%6%1xEi)I`~!yXvyEZ1pyYVzGBvmj)-_ zQy?+}$(CdbLy_-;LnTCep_d`l(2`dG8e7r(z5~Br4t{_nnFoY<2;@na(@^Dm zjH{5P`9U3$#-4vfDWPgh9ZFsW|9w1Cd=1xV#$L`pVT_4lnvJMOu#U8%=a^TG7NH-Z zQ$N0+(W&AMLZGpWUo7vn19XX$<)$U?p31)P z-y_x;>a@nnJiW91%Q+rQdU{|gP)csO=Mp;-O>IqO3Q=7a_8(%xq@+gfswz_AN-fHK zD$g|pnYEliOT%VRcj|cy?m$rR`d4nDNx=5Wo+#X3= Z%n)7Ti?=FvP83V2oj-PvGDLzUd2O81iGhyi z@}2KLU!xWQUj{)C*S3laCE~JixzVp|9UIHa21hMMD?alp8(C4}i1eqbjK;C7Oi4^6 zmY7j&OIuSlsR%!$Z@=rzggA-5F>Y}h@u}yPwl2|G zoOigeEiOCE#P2Y((xfDDl@G>wi$%2BIYg}rr!=nl*c)A47KEGpfbo_uhHv*rS!PKO e=W*BL{t)}{m-Vp*cG=_6;mOB-?(iaN%YFbYxO0jC literal 0 HcmV?d00001 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ac29fa0..0dc4e469 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ message(STATUS "CMake version: ${CMAKE_VERSION}") -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.1.0) # Determine if fmt is built as a subproject (using add_subdirectory) # or if it is the master project. @@ -28,20 +28,12 @@ if (NOT CMAKE_BUILD_TYPE) endif () option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF) +option(FMT_WERROR "Halt the compilation with an error on compiler warnings." OFF) # Options that control generation of various targets. option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT}) option(FMT_INSTALL "Generate the install target." ${MASTER_PROJECT}) option(FMT_TEST "Generate the test target." ${MASTER_PROJECT}) -option(FMT_USE_CPP14 "Enable the addition of C++14 compiler flags." ON) - -if (NOT CMAKE_CXX_STANDARD) - if (FMT_USE_CPP14) - set(CMAKE_CXX_STANDARD 14) - else () - set(CMAKE_CXX_STANDARD 11) - endif() -endif() project(FMT) @@ -66,6 +58,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/support/cmake") include(cxx14) +include(CheckCXXCompilerFlag) if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") set(PEDANTIC_COMPILE_FLAGS -pedantic-errors -Wall -Wextra -pedantic @@ -76,16 +69,16 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") -Wctor-dtor-privacy -Wdisabled-optimization -Winvalid-pch -Wmissing-declarations -Woverloaded-virtual -Wno-sign-conversion -Wno-shadow -Wno-format-nonliteral - -Wno-dangling-else) - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6) + -Wno-dangling-else -Wno-ctor-dtor-privacy) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6) set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wnoexcept) endif () - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wdouble-promotion -Wtrampolines -Wzero-as-null-pointer-constant -Wuseless-cast -Wvector-operation-performance -Wsized-deallocation) endif () - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wshift-overflow=2 -Wnull-dereference -Wduplicated-cond) endif () @@ -100,9 +93,22 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") -Wno-global-constructors -Wno-disabled-macro-expansion -Wno-switch-enum -Wno-documentation-unknown-command -Wno-gnu-string-literal-operator-template -Wno-unused-member-function - -Wno-format-nonliteral -Wno-missing-noreturn -Wno-undefined-func-template) + -Wno-format-nonliteral -Wno-missing-noreturn -Wno-undefined-func-template + -Wno-shadow -Wno-sign-conversion -Wno-used-but-marked-unused + -Wno-covered-switch-default -Wno-missing-variable-declarations + -Wno-double-promotion) set(WERROR_FLAG -Werror) + + check_cxx_compiler_flag(-Wno-zero-as-null-pointer-constant HAS_NULLPTR_WARNING) + if (HAS_NULLPTR_WARNING) + set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-zero-as-null-pointer-constant) + endif () + + check_cxx_compiler_flag(-Wno-gnu-string-literal-operator-template HAS_GNU_UDL_WARNING) + if (HAS_GNU_UDL_WARNING) + set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-gnu-string-literal-operator-template) + endif () endif () if (MSVC) @@ -153,9 +159,6 @@ endif () add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS} README.rst ChangeLog.rst) add_library(fmt::fmt ALIAS fmt) -# Starting with CMake 3.1 the CXX_STANDARD property can be used instead. -# Don't export -std since it may break projects that use other standards. -target_compile_options(fmt PRIVATE ${CPP14_FLAG}) if (FMT_WERROR) target_compile_options(fmt PRIVATE ${WERROR_FLAG}) endif () @@ -180,17 +183,14 @@ if (BUILD_SHARED_LIBS) target_compile_definitions(fmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED) endif () -# Additionally define a header-only library when CMake is new enough. -if (CMAKE_VERSION VERSION_GREATER 3.1.0 OR CMAKE_VERSION VERSION_EQUAL 3.1.0) - add_library(fmt-header-only INTERFACE) - add_library(fmt::fmt-header-only ALIAS fmt-header-only) +add_library(fmt-header-only INTERFACE) +add_library(fmt::fmt-header-only ALIAS fmt-header-only) - target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1) +target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1) - target_include_directories(fmt-header-only INTERFACE - $ - $) -endif () +target_include_directories(fmt-header-only INTERFACE + $ + $) # Install targets. if (FMT_INSTALL) diff --git a/include/fmt/core.h b/include/fmt/core.h index 55fddfbd..9bd3db13 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -48,6 +48,12 @@ # define FMT_HAS_GXX_CXX11 0 #endif +#ifdef _MSC_VER +# define FMT_MSC_VER _MSC_VER +#else +# define FMT_MSC_VER 0 +#endif + // Check if relaxed c++14 constexpr is supported. // GCC doesn't allow throw in constexpr until version 6 (bug 67371). #ifndef FMT_USE_CONSTEXPR diff --git a/include/fmt/format.h b/include/fmt/format.h index ccafe497..410c19be 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -51,12 +51,6 @@ # define FMT_ICC_VERSION 0 #endif -#ifdef _MSC_VER -# define FMT_MSC_VER _MSC_VER -#else -# define FMT_MSC_VER 0 -#endif - #if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 406) || \ FMT_CLANG_VERSION # pragma GCC diagnostic push @@ -96,7 +90,7 @@ # if FMT_EXCEPTIONS # define FMT_THROW(x) throw x # else -# define FMT_THROW(x) assert(false) +# define FMT_THROW(x) do { static_cast(sizeof(x)); assert(false); } while(false); # endif #endif diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h index d946eb36..cdb01ad6 100644 --- a/include/fmt/ranges.h +++ b/include/fmt/ranges.h @@ -139,11 +139,11 @@ using make_index_sequence = std::make_index_sequence; #else template struct integer_sequence { - typedef T value_type; + typedef T value_type; - static FMT_CONSTEXPR std::size_t size() { - return sizeof...(N); - } + static FMT_CONSTEXPR std::size_t size() { + return sizeof...(N); + } }; template diff --git a/support/cmake/cxx14.cmake b/support/cmake/cxx14.cmake index eb2c77e9..083f7886 100644 --- a/support/cmake/cxx14.cmake +++ b/support/cmake/cxx14.cmake @@ -1,67 +1,52 @@ # C++14 feature support detection -if (NOT FMT_USE_CPP14) - return() -endif () - +include(CheckCXXSourceCompiles) include(CheckCXXCompilerFlag) -if (FMT_USE_CPP14) - check_cxx_compiler_flag(-std=c++14 HAVE_STD_CPP14_FLAG) - if (HAVE_STD_CPP14_FLAG) - # Check if including cmath works with -std=c++14 and -O3. - # It may not in MinGW due to bug http://ehc.ac/p/mingw/bugs/2250/. - set(CMAKE_REQUIRED_FLAGS "-std=c++14 -O3") - check_cxx_source_compiles(" - #include - int main() {}" FMT_CPP14_CMATH) - # Check if including works with -std=c++14. - # It may not in MinGW due to bug http://sourceforge.net/p/mingw/bugs/2024/. - check_cxx_source_compiles(" - #include - int main() {}" FMT_CPP14_UNISTD_H) - # Check if snprintf works with -std=c++14. It may not in MinGW. - check_cxx_source_compiles(" - #include - int main() { - char buffer[10]; - snprintf(buffer, 10, \"foo\"); - }" FMT_CPP14_SNPRINTF) - if (FMT_CPP14_CMATH AND FMT_CPP14_UNISTD_H AND FMT_CPP14_SNPRINTF) - set(CPP14_FLAG -std=c++14) - else () - check_cxx_compiler_flag(-std=gnu++14 HAVE_STD_GNUPP14_FLAG) - if (HAVE_STD_CPP14_FLAG) - set(CPP14_FLAG -std=gnu++14) - endif () - endif () - set(CMAKE_REQUIRED_FLAGS ) - else () - check_cxx_compiler_flag(-std=c++1y HAVE_STD_CPP1Y_FLAG) - if (HAVE_STD_CPP1Y_FLAG) - set(CPP14_FLAG -std=c++1y) - else () - # Fallback on c++11 if c++14 is not available. - check_cxx_compiler_flag(-std=c++11 HAVE_STD_CPP11_FLAG) - if (HAVE_STD_CPP11_FLAG) - set(CPP14_FLAG -std=c++11) - else () - check_cxx_compiler_flag(-std=c++0x HAVE_STD_CPP0X_FLAG) - if (HAVE_STD_CPP0X_FLAG) - set(CPP14_FLAG -std=c++0x) - endif () - endif () - endif () +if (NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif() +message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}") + +if (CMAKE_CXX_STANDARD EQUAL 20) + check_cxx_compiler_flag(-std=c++20 has_std_20_flag) + check_cxx_compiler_flag(-std=c++2a has_std_2a_flag) + + if (has_std_20_flag) + set(CXX_STANDARD_FLAG -std=c++20) + elseif (has_std_2a_flag) + set(CXX_STANDARD_FLAG -std=c++2a) + endif () +elseif (CMAKE_CXX_STANDARD EQUAL 17) + check_cxx_compiler_flag(-std=c++17 has_std_17_flag) + check_cxx_compiler_flag(-std=c++1z has_std_1z_flag) + + if (has_std_17_flag) + set(CXX_STANDARD_FLAG -std=c++17) + elseif (has_std_1z_flag) + set(CXX_STANDARD_FLAG -std=c++1z) + endif () +elseif (CMAKE_CXX_STANDARD EQUAL 14) + check_cxx_compiler_flag(-std=c++14 has_std_14_flag) + check_cxx_compiler_flag(-std=c++1y has_std_1y_flag) + + if (has_std_14_flag) + set(CXX_STANDARD_FLAG -std=c++14) + elseif (has_std_1y_flag) + set(CXX_STANDARD_FLAG -std=c++1y) + endif () +elseif (CMAKE_CXX_STANDARD EQUAL 11) + check_cxx_compiler_flag(-std=c++11 has_std_14_flag) + check_cxx_compiler_flag(-std=c++0x has_std_0x_flag) + + if (has_std_11_flag) + set(CXX_STANDARD_FLAG -std=c++11) + elseif (has_std_0x_flag) + set(CXX_STANDARD_FLAG -std=c++0x) endif () endif () -if (CMAKE_CXX_STANDARD) - # Don't use -std compiler flag if CMAKE_CXX_STANDARD is specified. - set(CPP14_FLAG ) -endif () - -message(STATUS "CPP14_FLAG: ${CPP14_FLAG}") -set(CMAKE_REQUIRED_FLAGS ${CPP14_FLAG}) +set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG}) # Check if variadic templates are working and not affected by GCC bug 39653: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39653 @@ -69,17 +54,26 @@ check_cxx_source_compiles(" template struct S { typedef typename S::type type; }; int main() {}" SUPPORTS_VARIADIC_TEMPLATES) +if (NOT SUPPORTS_VARIADIC_TEMPLATES) + set (SUPPORTS_VARIADIC_TEMPLATES OFF) +endif () # Check if initializer lists are supported. check_cxx_source_compiles(" #include int main() {}" SUPPORTS_INITIALIZER_LIST) +if (NOT SUPPORTS_INITIALIZER_LIST) + set (SUPPORTS_INITIALIZER_LIST OFF) +endif () # Check if enum bases are available check_cxx_source_compiles(" enum C : char {A}; int main() {}" SUPPORTS_ENUM_BASE) +if (NOT SUPPORTS_ENUM_BASE) + set (SUPPORTS_ENUM_BASE OFF) +endif () # Check if type traits are available check_cxx_source_compiles(" @@ -87,11 +81,17 @@ check_cxx_source_compiles(" class C { void operator=(const C&); }; int main() { static_assert(!std::is_copy_assignable::value, \"\"); }" SUPPORTS_TYPE_TRAITS) +if (NOT SUPPORTS_TYPE_TRAITS) + set (SUPPORTS_TYPE_TRAITS OFF) +endif () # Check if user-defined literals are available check_cxx_source_compiles(" void operator\"\" _udl(long double); int main() {}" SUPPORTS_USER_DEFINED_LITERALS) +if (NOT SUPPORTS_USER_DEFINED_LITERALS) + set (SUPPORTS_USER_DEFINED_LITERALS OFF) +endif () set(CMAKE_REQUIRED_FLAGS ) diff --git a/support/travis-build.py b/support/travis-build.py index 6cdbf1b8..d71a7ae6 100755 --- a/support/travis-build.py +++ b/support/travis-build.py @@ -2,8 +2,8 @@ # Build the project on Travis CI. from __future__ import print_function -import errno, os, re, shutil, subprocess, sys, tempfile, urllib -from subprocess import call, check_call, check_output, Popen, PIPE, STDOUT +import errno, os, shutil, subprocess, sys, urllib +from subprocess import call, check_call, Popen, PIPE, STDOUT def rmtree_if_exists(dir): try: @@ -85,14 +85,12 @@ test_build_dir = os.path.join(fmt_dir, "_build_test") # Configure library. makedirs_if_not_exist(build_dir) -common_cmake_flags = [ - '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build +cmake_flags = [ + '-DCMAKE_INSTALL_PREFIX=' + install_dir, '-DCMAKE_BUILD_TYPE=' + build, + '-DCMAKE_CXX_STANDARD=' + standard ] -extra_cmake_flags = [] -if standard != '14': - extra_cmake_flags = ['-DCMAKE_CXX_STANDARD=' + standard] check_call(['cmake', '-DFMT_DOC=OFF', '-DFMT_PEDANTIC=ON', '-DFMT_WERROR=ON', fmt_dir] + - common_cmake_flags + extra_cmake_flags, cwd=build_dir) + cmake_flags, cwd=build_dir) # Build library. check_call(['make', '-j4'], cwd=build_dir) @@ -101,7 +99,7 @@ check_call(['make', '-j4'], cwd=build_dir) env = os.environ.copy() env['CTEST_OUTPUT_ON_FAILURE'] = '1' if call(['make', 'test'], env=env, cwd=build_dir): - with open('Testing/Temporary/LastTest.log', 'r') as f: + with open(os.path.join(build_dir, 'Testing', 'Temporary', 'LastTest.log'), 'r') as f: print(f.read()) sys.exit(-1) @@ -110,7 +108,6 @@ check_call(['make', 'install'], cwd=build_dir) # Test installation. makedirs_if_not_exist(test_build_dir) -check_call(['cmake', '-DCMAKE_CXX_STANDARD=' + standard, - os.path.join(fmt_dir, "test", "find-package-test")] + - common_cmake_flags, cwd=test_build_dir) +check_call(['cmake', os.path.join(fmt_dir, "test", "find-package-test")] + + cmake_flags, cwd=test_build_dir) check_call(['make', '-j4'], cwd=test_build_dir) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8978a083..8d2ccc67 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(gmock STATIC gmock-gtest-all.cc gmock/gmock.h gtest/gtest.h gtest/gtest-spi.h) target_compile_definitions(gmock PUBLIC GTEST_HAS_STD_WSTRING=1) -target_include_directories(gmock PUBLIC .) +target_include_directories(gmock SYSTEM PUBLIC . gmock gtest) find_package(Threads) if (Threads_FOUND) @@ -42,6 +42,7 @@ set(TEST_MAIN_SRC test-main.cc gtest-extra.cc gtest-extra.h util.cc) add_library(test-main STATIC ${TEST_MAIN_SRC}) target_compile_definitions(test-main PUBLIC FMT_USE_FILE_DESCRIPTORS=$) +target_include_directories(test-main SYSTEM PUBLIC gtest gmock) target_link_libraries(test-main gmock fmt) include(CheckCXXCompilerFlag) @@ -56,7 +57,7 @@ endif () # Use less strict pedantic flags for the tests because GMock doesn't compile # cleanly with -pedantic and -std=c++98. if (CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) - set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wno-long-long -Wno-variadic-macros) + #set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -Wno-long-long -Wno-variadic-macros) endif () function(add_fmt_executable name) @@ -79,6 +80,7 @@ function(add_fmt_test name) if (FMT_PEDANTIC) target_compile_options(${name} PRIVATE ${PEDANTIC_COMPILE_FLAGS}) endif () + target_include_directories(${name} SYSTEM PUBLIC gtest gmock) add_test(NAME ${name} COMMAND ${name}) endfunction() @@ -100,6 +102,10 @@ if (HAVE_OPEN) posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR}/include) target_compile_definitions(posix-mock-test PRIVATE FMT_USE_FILE_DESCRIPTORS=1) target_link_libraries(posix-mock-test gmock) + target_include_directories(posix-mock-test SYSTEM PUBLIC gtest gmock) + if (FMT_PEDANTIC) + target_compile_options(posix-mock-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) + endif () add_test(NAME posix-mock-test COMMAND posix-mock-test) add_fmt_test(posix-test) endif () @@ -107,6 +113,7 @@ endif () add_fmt_executable(header-only-test header-only-test.cc header-only-test2.cc test-main.cc) target_link_libraries(header-only-test gmock) +target_include_directories(header-only-test SYSTEM PUBLIC gtest gmock) if (TARGET fmt-header-only) target_link_libraries(header-only-test fmt-header-only) else () @@ -122,8 +129,14 @@ if (HAVE_FNO_EXCEPTIONS_FLAG) target_include_directories( noexception-test PRIVATE ${PROJECT_SOURCE_DIR}/include) target_compile_options(noexception-test PRIVATE -fno-exceptions) + if (FMT_PEDANTIC) + target_compile_options(noexception-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) + endif () + target_include_directories(noexception-test SYSTEM PUBLIC gtest gmock) endif () +message(STATUS "FMT_PEDANTIC: ${FMT_PEDANTIC}") + if (FMT_PEDANTIC) # Test that the library compiles without windows.h. if (CMAKE_SYSTEM_NAME STREQUAL "Windows") @@ -131,8 +144,14 @@ if (FMT_PEDANTIC) target_include_directories( no-windows-h-test PRIVATE ${PROJECT_SOURCE_DIR}/include) target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0) + if (FMT_PEDANTIC) + target_compile_options(no-windows-h-test ${PEDANTIC_COMPILE_FLAGS}) + endif () + target_include_directories(no-windows-h-test SYSTEM PUBLIC gtest gmock) endif () + message(STATUS USER_DEFINED_LITERALS: ${SUPPORTS_USER_DEFINED_LITERALS}) + add_test(compile-test ${CMAKE_CTEST_COMMAND} --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/compile-test" @@ -142,6 +161,8 @@ if (FMT_PEDANTIC) --build-options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" + "-DCXX_STANDARD_FLAG=${CXX_STANDARD_FLAG}" + "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}" "-DSUPPORTS_USER_DEFINED_LITERALS=${SUPPORTS_USER_DEFINED_LITERALS}") # test if the targets are findable from the build directory @@ -156,6 +177,7 @@ if (FMT_PEDANTIC) "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DFMT_DIR=${PROJECT_BINARY_DIR}" + "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") # test if the targets are findable when add_subdirectory is used @@ -169,5 +191,6 @@ if (FMT_PEDANTIC) --build-options "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" + "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif () diff --git a/test/add-subdirectory-test/CMakeLists.txt b/test/add-subdirectory-test/CMakeLists.txt index d1edd8a5..db7054bd 100644 --- a/test/add-subdirectory-test/CMakeLists.txt +++ b/test/add-subdirectory-test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.1.0) project(fmt-test) @@ -6,8 +6,12 @@ add_subdirectory(../.. fmt) add_executable(library-test "main.cc") target_link_libraries(library-test fmt::fmt) +target_compile_options(library-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) +target_include_directories(library-test PUBLIC SYSTEM .) if (TARGET fmt::fmt-header-only) add_executable(header-only-test "main.cc") target_link_libraries(header-only-test fmt::fmt-header-only) + target_compile_options(header-only-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) + target_include_directories(header-only-test PUBLIC SYSTEM .) endif () diff --git a/test/assert-test.cc b/test/assert-test.cc index 29c6d40b..8af9b09f 100644 --- a/test/assert-test.cc +++ b/test/assert-test.cc @@ -6,7 +6,7 @@ // For the license information refer to format.h. #include "fmt/core.h" -#include "gtest/gtest.h" +#include "gtest.h" #if GTEST_HAS_DEATH_TEST # define EXPECT_DEBUG_DEATH_IF_SUPPORTED(statement, regex) \ diff --git a/test/compile-test/CMakeLists.txt b/test/compile-test/CMakeLists.txt index dbf52b07..75a0c5a5 100644 --- a/test/compile-test/CMakeLists.txt +++ b/test/compile-test/CMakeLists.txt @@ -1,9 +1,12 @@ # Test if compile errors are produced where necessary. -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.1.0) include(CheckCXXSourceCompiles) +include(CheckCXXCompilerFlag) + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../../include) +set(CMAKE_REQUIRED_FLAGS ${CXX_STANDARD_FLAG} ${PEDANTIC_COMPILE_FLAGS}) function (generate_source result fragment) set(${result} " diff --git a/test/custom-formatter-test.cc b/test/custom-formatter-test.cc index dd513a59..919291ad 100644 --- a/test/custom-formatter-test.cc +++ b/test/custom-formatter-test.cc @@ -22,13 +22,21 @@ class custom_arg_formatter : using base::operator(); iterator operator()(double value) { - if (round(value * pow(10, spec().precision())) == 0) +#if FMT_GCC_VERSION +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wfloat-equal" +#endif + // Comparing a float to 0.0 is safe + if (round(value * pow(10, spec().precision())) == 0.0) value = 0; return base::operator()(value); +#if FMT_GCC_VERSION +#pragma GCC diagnostic pop +#endif } }; -std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) { +static std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) { fmt::memory_buffer buffer; // Pass custom argument formatter as a template arg to vwrite. fmt::vformat_to(buffer, format_str, args); diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt index 40c07560..51357557 100644 --- a/test/find-package-test/CMakeLists.txt +++ b/test/find-package-test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.1.0) project(fmt-test) @@ -6,8 +6,12 @@ find_package(FMT REQUIRED) add_executable(library-test main.cc) target_link_libraries(library-test fmt::fmt) +target_compile_options(library-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) +target_include_directories(library-test PUBLIC SYSTEM .) if (TARGET fmt::fmt-header-only) add_executable(header-only-test main.cc) target_link_libraries(header-only-test fmt::fmt-header-only) + target_compile_options(header-only-test PRIVATE ${PEDANTIC_COMPILE_FLAGS}) + target_include_directories(header-only-test PUBLIC SYSTEM .) endif () diff --git a/test/format-impl-test.cc b/test/format-impl-test.cc index d7511cd0..0daf00f5 100644 --- a/test/format-impl-test.cc +++ b/test/format-impl-test.cc @@ -16,7 +16,7 @@ #include #include -#include "gmock/gmock.h" +#include "gmock.h" #include "gtest-extra.h" #include "util.h" @@ -52,9 +52,9 @@ TEST(FormatTest, FormatNegativeNaN) { } TEST(FormatTest, StrError) { - char *message = 0; + char *message = nullptr; char buffer[BUFFER_SIZE]; - EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = 0, 0), "invalid buffer"); + EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = nullptr, 0), "invalid buffer"); EXPECT_ASSERT(fmt::safe_strerror(EDOM, message = buffer, 0), "invalid buffer"); buffer[0] = 'x'; diff --git a/test/format-test.cc b/test/format-test.cc index 0044390e..550b905e 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -14,7 +14,7 @@ #include #include -#include "gmock/gmock.h" +#include "gmock.h" // Test that the library compiles if None is defined to 0 as done by xlib.h. #define None 0 @@ -1024,7 +1024,7 @@ TEST(FormatterTest, FormatCString) { EXPECT_EQ("test", format("{0:s}", "test")); char nonconst[] = "nonconst"; EXPECT_EQ("nonconst", format("{0}", nonconst)); - EXPECT_THROW_MSG(format("{0}", reinterpret_cast(0)), + EXPECT_THROW_MSG(format("{0}", static_cast(nullptr)), format_error, "string pointer is null"); } @@ -1046,7 +1046,7 @@ TEST(FormatterTest, FormatUCharString) { TEST(FormatterTest, FormatPointer) { check_unknown_types(reinterpret_cast(0x1234), "p", "pointer"); - EXPECT_EQ("0x0", format("{0}", reinterpret_cast(0))); + EXPECT_EQ("0x0", format("{0}", static_cast(nullptr))); EXPECT_EQ("0x1234", format("{0}", reinterpret_cast(0x1234))); EXPECT_EQ("0x1234", format("{0:p}", reinterpret_cast(0x1234))); EXPECT_EQ("0x" + std::string(sizeof(void*) * CHAR_BIT / 4, 'f'), @@ -1148,7 +1148,7 @@ TEST(FormatterTest, FormatExamples) { FILE *ftest = safe_fopen(filename, "r"); if (ftest) fclose(ftest); int error_code = errno; - EXPECT_TRUE(ftest == 0); + EXPECT_TRUE(ftest == nullptr); EXPECT_SYSTEM_ERROR({ FILE *f = safe_fopen(filename, "r"); if (!f) @@ -1309,7 +1309,7 @@ TEST(StrTest, Convert) { EXPECT_EQ("2012-12-9", s); } -std::string vformat_message(int id, const char *format, fmt::format_args args) { +static std::string vformat_message(int id, const char *format, fmt::format_args args) { fmt::memory_buffer buffer; format_to(buffer, "[{}] ", id); vformat_to(buffer, format, args); @@ -1421,7 +1421,7 @@ class mock_arg_formatter: } }; -void custom_vformat(fmt::string_view format_str, fmt::format_args args) { +static void custom_vformat(fmt::string_view format_str, fmt::format_args args) { fmt::memory_buffer buffer; fmt::vformat_to(buffer, format_str, args); } @@ -1516,6 +1516,9 @@ TEST(FormatTest, FormatToN) { EXPECT_EQ(6u, result.size); EXPECT_EQ(buffer + 3, result.out); EXPECT_EQ("foox", fmt::string_view(buffer, 4)); + + // Workaround for potentially unused macro + static_cast(None); } #if FMT_USE_CONSTEXPR @@ -1794,12 +1797,14 @@ FMT_CONSTEXPR bool test_error(const char *fmt, const char *expected_error) { return equal(actual_error, expected_error); } +#define EXPECT_ERROR_NOARGS(fmt, error) \ + static_assert(test_error(fmt, error), "") #define EXPECT_ERROR(fmt, error, ...) \ static_assert(test_error<__VA_ARGS__>(fmt, error), "") TEST(FormatTest, FormatStringErrors) { - EXPECT_ERROR("foo", nullptr); - EXPECT_ERROR("}", "unmatched '}' in format string"); + EXPECT_ERROR_NOARGS("foo", nullptr); + EXPECT_ERROR_NOARGS("}", "unmatched '}' in format string"); EXPECT_ERROR("{0:s", "unknown format specifier", Date); #ifndef _MSC_VER // This causes an internal compiler error in MSVC2017. @@ -1807,7 +1812,7 @@ TEST(FormatTest, FormatStringErrors) { EXPECT_ERROR("{:{<}", "invalid fill character '{'", int); EXPECT_ERROR("{:10000000000}", "number is too big", int); EXPECT_ERROR("{:.10000000000}", "number is too big", int); - EXPECT_ERROR("{:x}", "argument index out of range"); + EXPECT_ERROR_NOARGS("{:x}", "argument index out of range"); EXPECT_ERROR("{:=}", "format specifier requires numeric argument", const char *); EXPECT_ERROR("{:+}", "format specifier requires numeric argument", @@ -1834,15 +1839,15 @@ TEST(FormatTest, FormatStringErrors) { EXPECT_ERROR("{:s}", "invalid type specifier", void *); #endif EXPECT_ERROR("{foo", "missing '}' in format string", int); - EXPECT_ERROR("{10000000000}", "number is too big"); - EXPECT_ERROR("{0x}", "invalid format string"); - EXPECT_ERROR("{-}", "invalid format string"); + EXPECT_ERROR_NOARGS("{10000000000}", "number is too big"); + EXPECT_ERROR_NOARGS("{0x}", "invalid format string"); + EXPECT_ERROR_NOARGS("{-}", "invalid format string"); EXPECT_ERROR("{:{0x}}", "invalid format string", int); EXPECT_ERROR("{:{-}}", "invalid format string", int); EXPECT_ERROR("{:.{0x}}", "invalid format string", int); EXPECT_ERROR("{:.{-}}", "invalid format string", int); EXPECT_ERROR("{:.x}", "missing precision specifier", int); - EXPECT_ERROR("{}", "argument index out of range"); + EXPECT_ERROR_NOARGS("{}", "argument index out of range"); EXPECT_ERROR("{1}", "argument index out of range", int); EXPECT_ERROR("{1}{}", "cannot switch from manual to automatic argument indexing", diff --git a/test/gmock-gtest-all.cc b/test/gmock-gtest-all.cc index 1a63a8ce..7dca684c 100644 --- a/test/gmock-gtest-all.cc +++ b/test/gmock-gtest-all.cc @@ -36,7 +36,7 @@ // This line ensures that gtest.h can be compiled on its own, even // when it's fused. -#include "gtest/gtest.h" +#include "gtest.h" // The following lines pull in the real gtest *.cc files. // Copyright 2005, Google Inc. diff --git a/test/gmock/gmock.h b/test/gmock/gmock.h index 8fd9c90c..2a9cbd53 100644 --- a/test/gmock/gmock.h +++ b/test/gmock/gmock.h @@ -235,7 +235,7 @@ // Most of the types needed for porting Google Mock are also required // for Google Test and are defined in gtest-port.h. -#include "gtest/gtest.h" +#include "gtest.h" // To avoid conditional compilation everywhere, we make it // gmock-port.h's responsibility to #include the header implementing diff --git a/test/gtest-extra-test.cc b/test/gtest-extra-test.cc index 8e42d8e2..13596b18 100644 --- a/test/gtest-extra-test.cc +++ b/test/gtest-extra-test.cc @@ -340,10 +340,10 @@ TEST(OutputRedirectTest, FlushErrorInCtor) { // Put a character in a file buffer. EXPECT_EQ('x', fputc('x', f.get())); FMT_POSIX(close(write_fd)); - scoped_ptr redir; + scoped_ptr redir{nullptr}; EXPECT_SYSTEM_ERROR_NOASSERT(redir.reset(new OutputRedirect(f.get())), EBADF, "cannot flush stream"); - redir.reset(); + redir.reset(nullptr); write_copy.dup2(write_fd); // "undo" close or dtor will fail } @@ -352,7 +352,7 @@ TEST(OutputRedirectTest, DupErrorInCtor) { int fd = (f.fileno)(); file copy = file::dup(fd); FMT_POSIX(close(fd)); - scoped_ptr redir; + scoped_ptr redir{nullptr}; EXPECT_SYSTEM_ERROR_NOASSERT(redir.reset(new OutputRedirect(f.get())), EBADF, fmt::format("cannot duplicate file descriptor {}", fd)); copy.dup2(fd); // "undo" close or dtor will fail @@ -403,7 +403,7 @@ TEST(OutputRedirectTest, ErrorInDtor) { // output in EXPECT_STDERR and the second close will break output // redirection. FMT_POSIX(close(write_fd)); - SUPPRESS_ASSERT(redir.reset()); + SUPPRESS_ASSERT(redir.reset(nullptr)); }, format_system_error(EBADF, "cannot flush stream")); write_copy.dup2(write_fd); // "undo" close or dtor of buffered_file will fail } diff --git a/test/gtest-extra.cc b/test/gtest-extra.cc index 2c4c34a7..2e5ea3e3 100644 --- a/test/gtest-extra.cc +++ b/test/gtest-extra.cc @@ -75,7 +75,7 @@ std::string read(file &f, std::size_t count) { do { n = f.read(&buffer[offset], count - offset); // We can't read more than size_t bytes since count has type size_t. - offset += static_cast(n); + offset += n; } while (offset < count && n != 0); buffer.resize(offset); return buffer; diff --git a/test/gtest-extra.h b/test/gtest-extra.h index db0323d2..c3728f53 100644 --- a/test/gtest-extra.h +++ b/test/gtest-extra.h @@ -9,7 +9,7 @@ #define FMT_GTEST_EXTRA_H_ #include -#include +#include "gmock.h" #include "fmt/core.h" @@ -155,7 +155,7 @@ std::string read(fmt::file &f, std::size_t count); template struct ScopedMock : testing::StrictMock { ScopedMock() { Mock::instance = this; } - ~ScopedMock() { Mock::instance = 0; } + ~ScopedMock() { Mock::instance = nullptr; } }; #endif // FMT_GTEST_EXTRA_H_ diff --git a/test/mock-allocator.h b/test/mock-allocator.h index e32b3816..58e157a5 100644 --- a/test/mock-allocator.h +++ b/test/mock-allocator.h @@ -8,7 +8,7 @@ #ifndef FMT_MOCK_ALLOCATOR_H_ #define FMT_MOCK_ALLOCATOR_H_ -#include "gmock/gmock.h" +#include "gmock.h" template class MockAllocator { @@ -28,7 +28,7 @@ class AllocatorRef { public: typedef typename Allocator::value_type value_type; - explicit AllocatorRef(Allocator *alloc = 0) : alloc_(alloc) {} + explicit AllocatorRef(Allocator *alloc = nullptr) : alloc_(alloc) {} AllocatorRef(const AllocatorRef &other) : alloc_(other.alloc_) {} @@ -41,7 +41,7 @@ class AllocatorRef { private: void move(AllocatorRef &other) { alloc_ = other.alloc_; - other.alloc_ = 0; + other.alloc_ = nullptr; } public: diff --git a/test/ostream-test.cc b/test/ostream-test.cc index ffc2f8b2..85fea764 100644 --- a/test/ostream-test.cc +++ b/test/ostream-test.cc @@ -8,29 +8,29 @@ #include "fmt/ostream.h" #include -#include "gmock/gmock.h" +#include "gmock.h" #include "gtest-extra.h" #include "util.h" using fmt::format; using fmt::format_error; -std::ostream &operator<<(std::ostream &os, const Date &d) { +static std::ostream &operator<<(std::ostream &os, const Date &d) { os << d.year() << '-' << d.month() << '-' << d.day(); return os; } -std::wostream &operator<<(std::wostream &os, const Date &d) { +static std::wostream &operator<<(std::wostream &os, const Date &d) { os << d.year() << L'-' << d.month() << L'-' << d.day(); return os; } enum TestEnum {}; -std::ostream &operator<<(std::ostream &os, TestEnum) { +static std::ostream &operator<<(std::ostream &os, TestEnum) { return os << "TestEnum"; } -std::wostream &operator<<(std::wostream &os, TestEnum) { +static std::wostream &operator<<(std::wostream &os, TestEnum) { return os << L"TestEnum"; } @@ -95,7 +95,7 @@ TEST(OStreamTest, FormatSpecs) { } struct EmptyTest {}; -std::ostream &operator<<(std::ostream &os, EmptyTest) { +static std::ostream &operator<<(std::ostream &os, EmptyTest) { return os << ""; } @@ -145,7 +145,7 @@ TEST(OStreamTest, WriteToOStreamMaxSize) { } os(streambuf); testing::InSequence sequence; - const char *data = 0; + const char *data = nullptr; std::size_t size = max_size; do { typedef std::make_unsigned::type ustreamsize; @@ -154,7 +154,7 @@ TEST(OStreamTest, WriteToOStreamMaxSize) { EXPECT_CALL(streambuf, xsputn(data, static_cast(n))) .WillOnce(testing::Return(max_streamsize)); data += n; - size -= static_cast(n); + size -= n; } while (size != 0); fmt::internal::write(os, buffer); } diff --git a/test/posix-mock-test.cc b/test/posix-mock-test.cc index f69313c3..9218816f 100644 --- a/test/posix-mock-test.cc +++ b/test/posix-mock-test.cc @@ -6,7 +6,9 @@ // For the license information refer to format.h. // Disable bogus MSVC warnings. -#define _CRT_SECURE_NO_WARNINGS +#ifdef _MSC_VER +# define _CRT_SECURE_NO_WARNINGS +#endif #include "posix-mock.h" #include "../src/posix.cc" @@ -21,7 +23,7 @@ # undef ERROR #endif -#include "gmock/gmock.h" +#include "gmock.h" #include "gtest-extra.h" #include "util.h" @@ -131,7 +133,7 @@ int test::dup2(int fildes, int fildes2) { } FILE *test::fdopen(int fildes, const char *mode) { - EMULATE_EINTR(fdopen, 0); + EMULATE_EINTR(fdopen, nullptr); return ::FMT_POSIX(fdopen(fildes, mode)); } @@ -160,7 +162,7 @@ int test::pipe(int *pfds, unsigned psize, int textmode) { #endif FILE *test::fopen(const char *filename, const char *mode) { - EMULATE_EINTR(fopen, 0); + EMULATE_EINTR(fopen, nullptr); return ::fopen(filename, mode); } @@ -193,7 +195,7 @@ int (test::fileno)(FILE *stream) { # define EXPECT_EQ_POSIX(expected, actual) #endif -void write_file(fmt::cstring_view filename, fmt::string_view content) { +static void write_file(fmt::cstring_view filename, fmt::string_view content) { fmt::buffered_file f(filename, "w"); f.print("{}", content); } @@ -214,7 +216,7 @@ TEST(UtilTest, GetPageSize) { TEST(FileTest, OpenRetry) { write_file("test", "there must be something here"); - scoped_ptr f; + scoped_ptr f{nullptr}; EXPECT_RETRY(f.reset(new file("test", file::RDONLY)), open, "cannot open file test"); #ifndef _WIN32 @@ -230,7 +232,7 @@ TEST(FileTest, CloseNoRetryInDtor) { int saved_close_count = 0; EXPECT_WRITE(stderr, { close_count = 1; - f.reset(); + f.reset(nullptr); saved_close_count = close_count; close_count = 0; }, format_system_error(EINTR, "cannot close file") + "\n"); @@ -383,7 +385,7 @@ TEST(FileTest, FdopenNoRetry) { TEST(BufferedFileTest, OpenRetry) { write_file("test", "there must be something here"); - scoped_ptr f; + scoped_ptr f{nullptr}; EXPECT_RETRY(f.reset(new buffered_file("test", "r")), fopen, "cannot open file test"); #ifndef _WIN32 @@ -400,7 +402,7 @@ TEST(BufferedFileTest, CloseNoRetryInDtor) { int saved_fclose_count = 0; EXPECT_WRITE(stderr, { fclose_count = 1; - f.reset(); + f.reset(nullptr); saved_fclose_count = fclose_count; fclose_count = 0; }, format_system_error(EINTR, "cannot close file") + "\n"); @@ -436,8 +438,9 @@ TEST(ScopedMock, Scope) { ScopedMock mock; EXPECT_EQ(&mock, TestMock::instance); TestMock © = mock; + static_cast(copy); } - EXPECT_EQ(0, TestMock::instance); + EXPECT_EQ(nullptr, TestMock::instance); } #ifdef FMT_LOCALE @@ -504,7 +507,7 @@ TEST(LocaleTest, Locale) { #endif ScopedMock mock; LocaleType impl = reinterpret_cast(42); - EXPECT_CALL(mock, newlocale(LC_NUMERIC_MASK, StrEq("C"), 0)) + EXPECT_CALL(mock, newlocale(LC_NUMERIC_MASK, StrEq("C"), nullptr)) .WillOnce(Return(impl)); EXPECT_CALL(mock, freelocale(impl)); fmt::Locale locale; diff --git a/test/posix-test.cc b/test/posix-test.cc index 6f65ec38..f23d06b3 100644 --- a/test/posix-test.cc +++ b/test/posix-test.cc @@ -23,12 +23,12 @@ using fmt::file; using testing::internal::scoped_ptr; // Checks if the file is open by reading one character from it. -bool isopen(int fd) { +static bool isopen(int fd) { char buffer; return FMT_POSIX(read(fd, &buffer, 1)) == 1; } -bool isclosed(int fd) { +static bool isclosed(int fd) { char buffer; std::streamsize result = 0; SUPPRESS_ASSERT(result = FMT_POSIX(read(fd, &buffer, 1))); @@ -36,7 +36,7 @@ bool isclosed(int fd) { } // Opens a file for reading. -file open_file() { +static file open_file() { file read_end, write_end; file::pipe(read_end, write_end); write_end.write(FILE_CONTENT, std::strlen(FILE_CONTENT)); @@ -45,7 +45,7 @@ file open_file() { } // Attempts to write a string to a file. -void write(file &f, fmt::string_view s) { +static void write(file &f, fmt::string_view s) { std::size_t num_chars_left = s.size(); const char *ptr = s.data(); do { @@ -53,32 +53,32 @@ void write(file &f, fmt::string_view s) { ptr += count; // We can't write more than size_t bytes since num_chars_left // has type size_t. - num_chars_left -= static_cast(count); + num_chars_left -= count; } while (num_chars_left != 0); } TEST(BufferedFileTest, DefaultCtor) { buffered_file f; - EXPECT_TRUE(f.get() == 0); + EXPECT_TRUE(f.get() == nullptr); } TEST(BufferedFileTest, MoveCtor) { buffered_file bf = open_buffered_file(); FILE *fp = bf.get(); - EXPECT_TRUE(fp != 0); + EXPECT_TRUE(fp != nullptr); buffered_file bf2(std::move(bf)); EXPECT_EQ(fp, bf2.get()); - EXPECT_TRUE(bf.get() == 0); + EXPECT_TRUE(bf.get() == nullptr); } TEST(BufferedFileTest, MoveAssignment) { buffered_file bf = open_buffered_file(); FILE *fp = bf.get(); - EXPECT_TRUE(fp != 0); + EXPECT_TRUE(fp != nullptr); buffered_file bf2; bf2 = std::move(bf); EXPECT_EQ(fp, bf2.get()); - EXPECT_TRUE(bf.get() == 0); + EXPECT_TRUE(bf.get() == nullptr); } TEST(BufferedFileTest, MoveAssignmentClosesFile) { @@ -90,13 +90,13 @@ TEST(BufferedFileTest, MoveAssignmentClosesFile) { } TEST(BufferedFileTest, MoveFromTemporaryInCtor) { - FILE *fp = 0; + FILE *fp = nullptr; buffered_file f(open_buffered_file(&fp)); EXPECT_EQ(fp, f.get()); } TEST(BufferedFileTest, MoveFromTemporaryInAssignment) { - FILE *fp = 0; + FILE *fp = nullptr; buffered_file f; f = open_buffered_file(&fp); EXPECT_EQ(fp, f.get()); @@ -126,7 +126,7 @@ TEST(BufferedFileTest, CloseErrorInDtor) { // output in EXPECT_STDERR and the second close will break output // redirection. FMT_POSIX(close(f->fileno())); - SUPPRESS_ASSERT(f.reset()); + SUPPRESS_ASSERT(f.reset(nullptr)); }, format_system_error(EBADF, "cannot close file") + "\n"); } @@ -134,7 +134,7 @@ TEST(BufferedFileTest, Close) { buffered_file f = open_buffered_file(); int fd = f.fileno(); f.close(); - EXPECT_TRUE(f.get() == 0); + EXPECT_TRUE(f.get() == nullptr); EXPECT_TRUE(isclosed(fd)); } @@ -142,7 +142,7 @@ TEST(BufferedFileTest, CloseError) { buffered_file f = open_buffered_file(); FMT_POSIX(close(f.fileno())); EXPECT_SYSTEM_ERROR_NOASSERT(f.close(), EBADF, "cannot close file"); - EXPECT_TRUE(f.get() == 0); + EXPECT_TRUE(f.get() == nullptr); } TEST(BufferedFileTest, Fileno) { @@ -209,7 +209,7 @@ TEST(FileTest, MoveAssignmentClosesFile) { EXPECT_TRUE(isclosed(old_fd)); } -file OpenBufferedFile(int &fd) { +static file OpenBufferedFile(int &fd) { file f = open_file(); fd = f.descriptor(); return f; @@ -253,7 +253,7 @@ TEST(FileTest, CloseErrorInDtor) { // output in EXPECT_STDERR and the second close will break output // redirection. FMT_POSIX(close(f->descriptor())); - SUPPRESS_ASSERT(f.reset()); + SUPPRESS_ASSERT(f.reset(nullptr)); }, format_system_error(EBADF, "cannot close file") + "\n"); } diff --git a/test/printf-test.cc b/test/printf-test.cc index c15a3201..f9208c16 100644 --- a/test/printf-test.cc +++ b/test/printf-test.cc @@ -20,13 +20,13 @@ using fmt::format_error; const unsigned BIG_NUM = INT_MAX + 1u; // Makes format string argument positional. -std::string make_positional(fmt::string_view format) { +static std::string make_positional(fmt::string_view format) { std::string s(format.data(), format.size()); s.replace(s.find('%'), 1, "%1$"); return s; } -std::wstring make_positional(fmt::wstring_view format) { +static std::wstring make_positional(fmt::wstring_view format) { std::wstring s(format.data(), format.size()); s.replace(s.find(L'%'), 1, L"%1$"); return s; @@ -410,7 +410,7 @@ TEST(PrintfTest, Inf) { double inf = std::numeric_limits::infinity(); for (const char* type = "fega"; *type; ++type) { EXPECT_PRINTF("inf", fmt::format("%{}", *type), inf); - char upper = std::toupper(*type); + char upper = static_cast(std::toupper(*type)); EXPECT_PRINTF("INF", fmt::format("%{}", upper), inf); } } @@ -426,11 +426,11 @@ TEST(PrintfTest, Char) { TEST(PrintfTest, String) { EXPECT_PRINTF("abc", "%s", "abc"); - const char *null_str = 0; + const char *null_str = nullptr; EXPECT_PRINTF("(null)", "%s", null_str); EXPECT_PRINTF(" (null)", "%10s", null_str); EXPECT_PRINTF(L"abc", L"%s", L"abc"); - const wchar_t *null_wstr = 0; + const wchar_t *null_wstr = nullptr; EXPECT_PRINTF(L"(null)", L"%s", null_wstr); EXPECT_PRINTF(L" (null)", L"%10s", null_wstr); } @@ -439,22 +439,22 @@ TEST(PrintfTest, Pointer) { int n; void *p = &n; EXPECT_PRINTF(fmt::format("{}", p), "%p", p); - p = 0; + p = nullptr; EXPECT_PRINTF("(nil)", "%p", p); EXPECT_PRINTF(" (nil)", "%10p", p); const char *s = "test"; EXPECT_PRINTF(fmt::format("{:p}", s), "%p", s); - const char *null_str = 0; + const char *null_str = nullptr; EXPECT_PRINTF("(nil)", "%p", null_str); p = &n; EXPECT_PRINTF(fmt::format(L"{}", p), L"%p", p); - p = 0; + p = nullptr; EXPECT_PRINTF(L"(nil)", L"%p", p); EXPECT_PRINTF(L" (nil)", L"%10p", p); const wchar_t *w = L"test"; EXPECT_PRINTF(fmt::format(L"{:p}", w), L"%p", w); - const wchar_t *null_wstr = 0; + const wchar_t *null_wstr = nullptr; EXPECT_PRINTF(L"(nil)", L"%p", null_wstr); } diff --git a/test/ranges-test.cc b/test/ranges-test.cc index c27833f2..efe4f492 100644 --- a/test/ranges-test.cc +++ b/test/ranges-test.cc @@ -11,7 +11,7 @@ #include "fmt/ranges.h" -#include "gtest/gtest.h" +#include "gtest.h" #include #include diff --git a/test/test-main.cc b/test/test-main.cc index 2749a644..bc0be76a 100644 --- a/test/test-main.cc +++ b/test/test-main.cc @@ -6,7 +6,7 @@ // For the license information refer to format.h. #include -#include +#include "gtest.h" #ifdef _WIN32 # include diff --git a/test/time-test.cc b/test/time-test.cc index e285223b..bc05f24c 100644 --- a/test/time-test.cc +++ b/test/time-test.cc @@ -9,7 +9,7 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#include "gmock/gmock.h" +#include "gmock.h" #include "fmt/time.h" TEST(TimeTest, Format) { @@ -26,7 +26,7 @@ TEST(TimeTest, GrowBuffer) { for (int i = 0; i < 30; ++i) s += "%c"; s += "}\n"; - std::time_t t = std::time(0); + std::time_t t = std::time(nullptr); fmt::format(s, *std::localtime(&t)); } @@ -34,7 +34,7 @@ TEST(TimeTest, EmptyResult) { EXPECT_EQ("", fmt::format("{}", std::tm())); } -bool EqualTime(const std::tm &lhs, const std::tm &rhs) { +static bool EqualTime(const std::tm &lhs, const std::tm &rhs) { return lhs.tm_sec == rhs.tm_sec && lhs.tm_min == rhs.tm_min && lhs.tm_hour == rhs.tm_hour && @@ -47,13 +47,13 @@ bool EqualTime(const std::tm &lhs, const std::tm &rhs) { } TEST(TimeTest, LocalTime) { - std::time_t t = std::time(0); + std::time_t t = std::time(nullptr); std::tm tm = *std::localtime(&t); EXPECT_TRUE(EqualTime(tm, fmt::localtime(t))); } TEST(TimeTest, GMTime) { - std::time_t t = std::time(0); + std::time_t t = std::time(nullptr); std::tm tm = *std::gmtime(&t); EXPECT_TRUE(EqualTime(tm, fmt::gmtime(t))); } diff --git a/test/util-test.cc b/test/util-test.cc index d0fdefec..beab4ae7 100644 --- a/test/util-test.cc +++ b/test/util-test.cc @@ -17,7 +17,7 @@ # include #endif -#include "gmock/gmock.h" +#include "gmock.h" #include "gtest-extra.h" #include "mock-allocator.h" #include "util.h" @@ -71,8 +71,8 @@ struct formatter { }; FMT_END_NAMESPACE -void CheckForwarding( - MockAllocator &alloc, AllocatorRef< MockAllocator > &ref) { +static void CheckForwarding( + MockAllocator &alloc, AllocatorRef> &ref) { int mem; // Check if value_type is properly defined. AllocatorRef< MockAllocator >::value_type *ptr = &mem; @@ -92,7 +92,7 @@ TEST(AllocatorTest, AllocatorRef) { TestAllocatorRef ref2(ref); CheckForwarding(alloc, ref2); TestAllocatorRef ref3; - EXPECT_EQ(0, ref3.get()); + EXPECT_EQ(nullptr, ref3.get()); ref3 = ref; CheckForwarding(alloc, ref3); } @@ -112,7 +112,7 @@ TEST(BufferTest, Nonmoveable) { // A test buffer with a dummy grow method. template struct TestBuffer : basic_buffer { - void grow(std::size_t capacity) { this->set(0, capacity); } + void grow(std::size_t capacity) { this->set(nullptr, capacity); } }; template @@ -132,23 +132,23 @@ struct MockBuffer : basic_buffer { TEST(BufferTest, Ctor) { { MockBuffer buffer; - EXPECT_EQ(0, &buffer[0]); - EXPECT_EQ(0u, buffer.size()); - EXPECT_EQ(0u, buffer.capacity()); + EXPECT_EQ(nullptr, &buffer[0]); + EXPECT_EQ(static_cast(0), buffer.size()); + EXPECT_EQ(static_cast(0), buffer.capacity()); } { int dummy; MockBuffer buffer(&dummy); EXPECT_EQ(&dummy, &buffer[0]); - EXPECT_EQ(0u, buffer.size()); - EXPECT_EQ(0u, buffer.capacity()); + EXPECT_EQ(static_cast(0), buffer.size()); + EXPECT_EQ(static_cast(0), buffer.capacity()); } { int dummy; std::size_t capacity = std::numeric_limits::max(); MockBuffer buffer(&dummy, capacity); EXPECT_EQ(&dummy, &buffer[0]); - EXPECT_EQ(0u, buffer.size()); + EXPECT_EQ(static_cast(0), buffer.size()); EXPECT_EQ(capacity, buffer.capacity()); } } @@ -201,7 +201,7 @@ TEST(BufferTest, Clear) { TestBuffer buffer; buffer.resize(20); buffer.resize(0); - EXPECT_EQ(0u, buffer.size()); + EXPECT_EQ(static_cast(0), buffer.size()); EXPECT_EQ(20u, buffer.capacity()); } @@ -231,7 +231,7 @@ TEST(BufferTest, AppendAllocatesEnoughStorage) { TEST(MemoryBufferTest, Ctor) { basic_memory_buffer buffer; - EXPECT_EQ(0u, buffer.size()); + EXPECT_EQ(static_cast(0), buffer.size()); EXPECT_EQ(123u, buffer.capacity()); } @@ -239,7 +239,7 @@ TEST(MemoryBufferTest, Ctor) { typedef AllocatorRef< std::allocator > TestAllocator; -void check_move_buffer(const char *str, +static void check_move_buffer(const char *str, basic_memory_buffer &buffer) { std::allocator *alloc = buffer.get_allocator().get(); basic_memory_buffer buffer2(std::move(buffer)); @@ -248,7 +248,7 @@ void check_move_buffer(const char *str, EXPECT_EQ(str, std::string(&buffer2[0], buffer2.size())); EXPECT_EQ(5u, buffer2.capacity()); // Move should transfer allocator. - EXPECT_EQ(0, buffer.get_allocator().get()); + EXPECT_EQ(nullptr, buffer.get_allocator().get()); EXPECT_EQ(alloc, buffer2.get_allocator().get()); } @@ -273,7 +273,7 @@ TEST(MemoryBufferTest, MoveCtor) { EXPECT_GT(buffer2.capacity(), 5u); } -void check_move_assign_buffer( +static void check_move_assign_buffer( const char *str, basic_memory_buffer &buffer) { basic_memory_buffer buffer2; buffer2 = std::move(buffer); @@ -335,7 +335,7 @@ TEST(MemoryBufferTest, Grow) { TEST(MemoryBufferTest, Allocator) { typedef AllocatorRef< MockAllocator > TestAllocator; basic_memory_buffer buffer; - EXPECT_EQ(0, buffer.get_allocator().get()); + EXPECT_EQ(nullptr, buffer.get_allocator().get()); StrictMock< MockAllocator > alloc; char mem; { @@ -376,7 +376,7 @@ TEST(MemoryBufferTest, ExceptionInDeallocate) { TEST(FixedBufferTest, Ctor) { char array[10] = "garbage"; fmt::basic_fixed_buffer buffer(array, sizeof(array)); - EXPECT_EQ(0u, buffer.size()); + EXPECT_EQ(static_cast(0), buffer.size()); EXPECT_EQ(10u, buffer.capacity()); EXPECT_EQ(array, buffer.data()); } @@ -384,7 +384,7 @@ TEST(FixedBufferTest, Ctor) { TEST(FixedBufferTest, CompileTimeSizeCtor) { char array[10] = "garbage"; fmt::basic_fixed_buffer buffer(array); - EXPECT_EQ(0u, buffer.size()); + EXPECT_EQ(static_cast(0), buffer.size()); EXPECT_EQ(10u, buffer.capacity()); EXPECT_EQ(array, buffer.data()); } @@ -439,7 +439,7 @@ struct custom_context { const char *format(const T &, custom_context& ctx) { ctx.called = true; - return 0; + return nullptr; } }; }; @@ -583,8 +583,8 @@ TEST(UtilTest, WStringArg) { } TEST(UtilTest, PointerArg) { - void *p = 0; - const void *cp = 0; + void *p = nullptr; + const void *cp = nullptr; CHECK_ARG_(char, cp, p); CHECK_ARG_(wchar_t, cp, p); CHECK_ARG(cp, ); @@ -772,7 +772,7 @@ TEST(UtilTest, FormatSystemError) { fmt::print("warning: std::allocator allocates {} chars", max_size); return; } - fmt::format_system_error(message, EDOM, fmt::string_view(0, max_size)); + fmt::format_system_error(message, EDOM, fmt::string_view(nullptr, max_size)); EXPECT_EQ(fmt::format("error {}", EDOM), to_string(message)); } @@ -868,7 +868,7 @@ TEST(UtilTest, IsEnumConvertibleToInt) { #endif TEST(UtilTest, ParseNonnegativeInt) { - if (std::numeric_limits::max() != (1 << 31)) { + if (std::numeric_limits::max() != static_cast(static_cast(1) << 31)) { fmt::print("Skipping parse_nonnegative_int test\n"); return; } diff --git a/test/util.h b/test/util.h index a4440bb0..c0af03c7 100644 --- a/test/util.h +++ b/test/util.h @@ -35,7 +35,7 @@ std::string get_system_error(int error_code); extern const char *const FILE_CONTENT; // Opens a buffered file for reading. -fmt::buffered_file open_buffered_file(FILE **fp = 0); +fmt::buffered_file open_buffered_file(FILE **fp = nullptr); inline FILE *safe_fopen(const char *filename, const char *mode) { #if defined(_WIN32) && !defined(__MINGW32__)