Fix Travis

.travis-ci.sh

@@ -64,7 +64,7 @@ if [[ $TASK = 'lint' ]]; then
   if [[ $? -ne 0 ]]; then
     exit 1;
   fi;
-  ./scripts/verify_cpplint_coverge.py ./ ./cpplint.log
+  ./scripts/verify_cpplint_coverage.py ./ ./cpplint.log
 elif [[ $TASK = 'check-licences' ]]; then
   # check licences only if it is the requested task
   ./scripts/enforce_licence.py

.travis.yml

@@ -7,7 +7,7 @@ matrix:
   fast_finish: true
   include:
     - os: linux
-      dist: trusty
+      dist: bionic
       compiler: clang
       env: TASK='compile'
     - os: linux
@@ -39,7 +39,7 @@ matrix:
       sudo: false
       env: TASK='check-licences'
     - os: linux
-      dist: trusty
+      dist: bionic
       # Short duration job, use the container/without sudo image as it boots faster
       sudo: false
       env: TASK='codespell'
@@ -81,12 +81,13 @@ before_install:
  # Remove some flaky repos that keep timing out, probably not necessary any more
  - if [ -e /etc/apt/sources.list.d/mongodb.list ]; then sudo rm /etc/apt/sources.list.d/mongodb.list; fi
  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- - sudo add-apt-repository ppa:voltvisionfrenchy/ola -y
- - sudo add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main" -y
- - sudo add-apt-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" -y
+ # Installed directly from Ubuntu on bionic
+ - if [ "$TRAVIS_DIST" = "trusty" ]; then sudo add-apt-repository ppa:voltvisionfrenchy/ola -y; fi
  - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+ - if [ "$TRAVIS_DIST" = "bionic" ]; then sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" -y; fi
+ - if [ "$TRAVIS_DIST" = "bionic" ]; then sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main" -y; fi
  # Required for Doxygen 1.8.8+
- - sudo add-apt-repository ppa:techzilla/doxygen-backport -y
+ - if [ "$TRAVIS_DIST" = "trusty" ]; then sudo add-apt-repository ppa:techzilla/doxygen-backport -y; fi
  - sudo apt-get update -qq
  - sudo apt-get install --force-yes ola libola-dev libprotobuf-dev
  #Coverity doesn't work with g++ 5, so only upgrade to g++ 4.9 for that
@@ -98,18 +99,19 @@ before_install:
  - if [ "$CXX" = "g++-4.9" -o "$CXX" = "g++-5" ]; then sudo rm /usr/bin/g++; sudo rm /usr/bin/gcc; fi
  #Install latest clang if we're compiling with clang
  #clang-3.8 packages seem to be unsigned so need forcing
- - if [ "$CXX" = "clang++" ]; then sudo apt-get install --force-yes -qq clang-6.0; fi
- - if [ "$CXX" = "clang++" ]; then export CXX="clang++-6.0" CC="clang-6.0"; fi
+ - if [ "$CXX" = "clang++" ]; then sudo apt-get install --force-yes -qq clang-12; fi
+ - if [ "$CXX" = "clang++" ]; then export CXX="clang++-12" CC="clang-12"; fi
  #Remove the old clang to ensure we're using the latest ones
- - if [ "$CXX" = "clang++-6.0" -a -e /usr/local/clang-3.4/bin/clang ]; then sudo rm /usr/local/clang-3.4/bin/clang; sudo rm /usr/local/clang-3.4/bin/clang++; fi
+ - if [ "$CXX" = "clang++-12" -a -e /usr/local/clang-3.4/bin/clang ]; then sudo rm /usr/local/clang-3.4/bin/clang; sudo rm /usr/local/clang-3.4/bin/clang++; fi
  #Report the compiler version
  - $CXX --version
  #Install coveralls if required
  - if [ "$TASK" = "coverage" ]; then sudo pip install -qq cpp-coveralls; fi
  #Install doxygen if required
  - if [ "$TASK" = "doxygen" -o "$TASK" = "doxygen-manual" ]; then sudo apt-get install -qq doxygen graphviz; fi
  - if [ "$TASK" = "compile" -o "$TASK" = "doxygen" -o "$TASK" = "doxygen-manual" -o "$TASK" = "coverage" -o "$TASK" = "coverity" ]; then ./install-gmock.sh; fi
- - if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/codespell-project/codespell.git; fi
+ - if [ "$TASK" = "codespell" ]; then pyenv global 3.8.1; fi
+ - if [ "$TASK" = "codespell" ]; then pip3 install --user git+https://github.com/codespell-project/codespell.git; fi
 
 after_success:
  - if [ "$TASK" = "coverity" ]; then tail -n 10000 /home/travis/build/${TRAVIS_REPO_SLUG}/cov-int/build-log.txt; cat /home/travis/build/${TRAVIS_REPO_SLUG}/cov-int/scm_log.txt; fi
@@ -118,7 +120,6 @@ after_success:
 after_failure:
  - cat /home/travis/build/${TRAVIS_REPO_SLUG}/config.log
 
-
 #No notifications for now
 #notifications:
 #  irc:

configure.ac

@@ -95,9 +95,9 @@ AC_ARG_WITH([gmock],
 # This is a mess, see
 # http://stackoverflow.com/questions/27091835/undefined-reference-to-pthread-key-create-argument-order-does-not-fix-issue
 GMOCK_INCLUDES="-isystem $with_gmock/googlemock/include"
-GMOCK_LIBS="$PTHREAD_CFLAGS $with_gmock/googlemock/lib/.libs/libgmock_main.a $with_gmock/googlemock/lib/.libs/libgmock.a"
+GMOCK_LIBS="$PTHREAD_CFLAGS $with_gmock/build/lib/libgmock_main.a $with_gmock/build/lib/libgmock.a"
 GTEST_INCLUDES="-isystem $with_gmock/googletest/include"
-GTEST_LIBS="$PTHREAD_CFLAGS $with_gmock/googletest/lib/.libs/libgtest.a $with_gmock/googletest/lib/.libs/libgtest_main.a"
+GTEST_LIBS="$PTHREAD_CFLAGS $with_gmock/build/lib/libgtest.a $with_gmock/build/lib/libgtest_main.a"
 
 # save CPPFLAGS
 old_cppflags=$CPPFLAGS

firmware/src/dimmer_model.h

@@ -43,7 +43,7 @@
  * ### Presets & Scenes.
  *
  * The root device provides 3 scenes. The first scene (index 1) is a factory
- * programed scene, which can't be modified. The 2nd and 3rd scenes can be
+ * programmed scene, which can't be modified. The 2nd and 3rd scenes can be
  * 'updated' with capture preset.
  *
  * DMX_FAIL_MODE and DMX_STARTUP_MODE can be used to change the on-failure and

firmware/src/transceiver.h

@@ -148,7 +148,7 @@ typedef enum {
  */
 typedef union {
   /**
-   * @brief The timing measurments for a DUB transaction.
+   * @brief The timing measurements for a DUB transaction.
    *
    * All times are measured in 10ths of a microsecond from the end of the DUB
    * frame.
@@ -159,7 +159,7 @@ typedef union {
   } dub_response;
 
   /**
-   * @brief The timing measurments for a Get / Set transaction.
+   * @brief The timing measurements for a Get / Set transaction.
    *
    * All times are measured in 10ths of a microsecond from the end of the DUB
    * frame.

install-gmock.sh

@@ -11,9 +11,7 @@ else
   git clone $GTEST_REPO $GTEST_DIRECTORY
   cd $GTEST_DIRECTORY;
 fi
-# Ideally do some clever detection of which flavour of gmock people have, for
-# now they'll just need to upgrade...
-#cd googlemock
-autoreconf -fi
-./configure
+mkdir build
+cd build
+cmake ..
 make

scripts/verify_cpplint_coverge.py → scripts/verify_cpplint_coverage.py

@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# verify_cpplint_coverge.py
+# verify_cpplint_coverage.py
 # Copyright (C) 2016 Peter Newman
 
 from __future__ import print_function
@@ -116,7 +116,7 @@ def main():
 
     print('\n---------------------------------------', file=sys.stderr)
     print('Either add the missing files to the cpplint run or update\n'
-          'IGNORE_PATTERNS in scripts/verify_cpplint_coverge.py',
+          'IGNORE_PATTERNS in scripts/verify_cpplint_coverage.py',
           file=sys.stderr)
     print('---------------------------------------', file=sys.stderr)
     sys.exit(1)

tests/tests/CoarseTimerTest.cpp

@@ -79,9 +79,9 @@ TEST_P(CoarseTimerTest, TimerWorks) {
   EXPECT_EQ(99, timer_events);
 }
 
-INSTANTIATE_TEST_CASE_P(InstantiationName,
-                        CoarseTimerTest,
-                        ::testing::Values(0, 1, 52, 0xfffffffe, 0xffffffff));
+INSTANTIATE_TEST_SUITE_P(InstantiationName,
+                         CoarseTimerTest,
+                         ::testing::Values(0, 1, 52, 0xfffffffe, 0xffffffff));
 
 TEST_F(CoarseTimerTest, interruptClear) {
   EXPECT_CALL(m_sys_int_mock, SourceStatusClear(INT_SOURCE_TIMER_2));

tests/tests/MessageHandlerTest.cpp

@@ -181,7 +181,7 @@ TEST_P(ConfigurationTest, CheckSetGet) {
   MessageHandler_HandleMessage(&get_message);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     SetCommand,
     ConfigurationTest,
     ::testing::Values(

tests/tests/RDMUtilTest.cpp

@@ -190,7 +190,7 @@ TEST_P(ChecksumTest, checksumFails) {
   EXPECT_FALSE(RDMUtil_VerifyChecksum(SAMPLE_MESSAGE, GetParam()));
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     sizeTooSmall,
     ChecksumTest,
     ::testing::Range(

tests/tests/USBTransportTest.cpp

@@ -34,6 +34,7 @@
 #include "usb_transport.h"
 
 using ::testing::Args;
+using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::NotNull;

tools/hex2dfu.c

@@ -230,14 +230,12 @@ void ProcessHexFile(int fd, const Options *options) {
     r = read(fd, &checksum_data, sizeof(checksum_data));
     if (r != sizeof(checksum_data)) {
       printf("Failed to read checksum on line %d\n", line);
-      free(data);
       return;
     }
 
     uint8_t checksum;
     if (!HexToUInt8(checksum_data, &checksum)) {
       printf("Invalid checksum on line %d\n", line);
-      free(data);
       return;
     }
 

user_manual/docs/rdm-responder.md

@@ -139,7 +139,7 @@ modulation frequencies.
 ## Presets & Scenes.
 
 The root device provides 3 scenes. The first scene (index 1) is a factory
-programed scene, which can't be modified. The 2nd and 3rd scenes can be
+programmed scene, which can't be modified. The 2nd and 3rd scenes can be
 'updated' with capture preset.
 
 DMX_FAIL_MODE and DMX_STARTUP_MODE can be used to change the on-failure and