Merge pull request #216 from peternewman/licence_enforcer

Fix some Coverity issues

Author: peternewman

Makefile.am

@@ -28,9 +28,12 @@ TESTS =
 
 ###################
 
+if BUILD_UNIT_TESTS
 include Bootloader/firmware/src/Makefile.mk
 include firmware/src/Makefile.mk
 include tests/Makefile.mk
+endif
+
 include tools/Makefile.mk
 
 check_PROGRAMS = $(TESTS)

configure.ac

@@ -25,8 +25,16 @@ AC_LANG_PUSH(C)
 AC_PROG_CC_C99
 AC_LANG_POP(C)
 
-# Check we have -std=c++11 support
-AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
+# Allow us to just build the tools without the unit tests
+AC_ARG_ENABLE(
+  [unit-tests],
+  [AS_HELP_STRING([--disable-unit-tests],
+  [Just build the tools without the unit tests])])
+AM_CONDITIONAL(BUILD_UNIT_TESTS, test "x$enable_unit_tests" != xno)
+
+# Check we have -std=c++11 support if required
+AM_COND_IF([BUILD_UNIT_TESTS],
+           [AX_CXX_COMPILE_STDCXX_11(noext,mandatory)])
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h])
@@ -84,7 +92,10 @@ GTEST_LIBS="$with_gmock/googletest/lib/libgtest.la $with_gmock/googletest/lib/li
 old_cppflags=$CPPFLAGS
 CPPFLAGS="$GMOCK_INCLUDES $GTEST_INCLUDES"
 
-AC_CHECK_HEADER([gmock/gmock.h], [], [AC_MSG_ERROR([Missing gmock/gmock.h])])
+AM_COND_IF([BUILD_UNIT_TESTS],
+           [AC_CHECK_HEADER([gmock/gmock.h],
+                            [],
+                            [AC_MSG_ERROR([Missing gmock/gmock.h])])])
 
 # restore CPPFLAGS
 CPPFLAGS=$old_cppflags
@@ -104,12 +115,11 @@ AC_ARG_WITH(
   [ola],
   [AS_HELP_STRING([--without-ola],
                   [Skip OLA checks, unittests will not work correctly])])
-AS_IF([test "x$with_ola" != xno],
-      [PKG_CHECK_MODULES(
-        OLA,
-        [libola],
-        [],
-        [AC_MSG_ERROR([Missing OLA, please install])])])
+AS_IF([test "x$enable_unit_tests" != xno && test "x$with_ola" != xno],
+      [PKG_CHECK_MODULES(OLA,
+                         [libola],
+                         [],
+                         [AC_MSG_ERROR([Missing OLA, please install])])])
 
 # Output
 #####################################################
@@ -125,6 +135,8 @@ C++ Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
 C Compiler: '${CC} ${CFLAGS} ${CPPFLAGS}'
 Linker: '${LD} ${LDFLAGS} ${LIBS}'
 
+Unit Tests: ${enable_unit_tests}
+
 Now type 'make @<:@<target>@:>@'
   where the optional <target> is:
     check        - run the tests

tests/mocks/Matchers.cpp

@@ -20,6 +20,7 @@
 
 #include "Matchers.h"
 
+#include <cctype>
 #include <gmock/gmock.h>
 
 
@@ -48,15 +49,14 @@ bool MemoryCompare(
       uint8_t expected = reinterpret_cast<const uint8_t*>(expected_data)[i];
 
       *listener
-         << "\n" << std::dec << i << ": 0x" << std::hex
+         << "\n" << i << ": 0x" << std::hex
          << static_cast<int>(expected)
          << (expected == actual ? " == " : " != ")
          << "0x" << static_cast<int>(actual) << " ("
-         << ((expected >= '!' && expected <= '~') ?
-             static_cast<char>(expected) : ' ')
+         << (std::isprint(expected) ? static_cast<char>(expected) : ' ')
          << (expected == actual ? " == " : " != ")
-         << (actual >= '!' && actual <= '~' ? static_cast<char>(actual) : ' ')
-         << ")";
+         << (std::isprint(actual) ? static_cast<char>(actual) : ' ')
+         << ")" << std::dec;
 
     }
     listener->stream()->flags(ostream_flags);
@@ -175,15 +175,14 @@ bool PayloadMatcher::MatchAndExplain(
 
     if (listener->IsInterested()) {
       *listener
-         << "\n" << std::dec << i << ": 0x" << std::hex
+         << "\n" << i << ": 0x" << std::hex
          << static_cast<int>(expected)
          << (expected == actual ? " == " : " != ")
          << "0x" << static_cast<int>(actual) << " ("
-         << ((expected >= '!' && expected <= '~') ?
-             static_cast<char>(expected) : ' ')
+         << (std::isprint(expected) ? static_cast<char>(expected) : ' ')
          << (expected == actual ? " == " : " != ")
-         << (actual >= '!' && actual <= '~' ? static_cast<char>(actual) : ' ')
-         << ")";
+         << (std::isprint(actual) ? static_cast<char>(actual) : ' ')
+         << ")" << std::dec;
     }
 
     matched &= (expected == actual);

tests/mocks/MessageHandlerMock.cpp

@@ -61,15 +61,14 @@ bool MessageMatcher::MatchAndExplain(
       uint8_t expected = reinterpret_cast<const uint8_t*>(m_payload)[i];
 
       *listener
-         << "\n" << std::dec << i << ": 0x" << std::hex
+         << "\n" << i << ": 0x" << std::hex
          << static_cast<int>(expected)
          << (expected == actual ? " == " : " != ")
          << "0x" << static_cast<int>(actual) << " ("
-         << ((expected >= '!' && expected <= '~') ?
-             static_cast<char>(expected) : ' ')
+         << (std::isprint(expected) ? static_cast<char>(expected) : ' ')
          << (expected == actual ? " == " : " != ")
-         << (actual >= '!' && actual <= '~' ? static_cast<char>(actual) : ' ')
-         << ")";
+         << (std::isprint(actual) ? static_cast<char>(actual) : ' ')
+         << ")" << std::dec;
 
       matched &= (expected == actual);
     }