Merge pull request #3107 from BOINC/cb_gtest_integration_ci

Tests: add unit testing framework using googletest

.codecov.yml

+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+comment:
+  layout: "diff, files"
+  behavior: default
+  require_changes: false  # if true: only post the comment if coverage changes
+  require_base: no        # [yes :: must have a base report to post]
+  require_head: yes       # [yes :: must have a head report to post]
+
+# don't gather statistics for tets and external libraries
+ignore:
+  - tests/.*
+  - zip/.*
+  - 3rdParty/.*

.gitignore

@@ -131,6 +131,11 @@ locale/*/*.flag
 .libs/
 svn_version.h
 
+## code coverage
+*.gcov
+*.gcno
+*.gcda
+
 # list of executables
 apps/1sec
 apps/concat

.travis.yml

@@ -57,12 +57,13 @@ matrix:
             - build-tools-28.0.3
             - android-28
             - extra-google-m2repository
-            - extra-android-m2repository    
+            - extra-android-m2repository
       env: BOINC_TYPE=manager-android
 
 before_install:
    - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then ( sudo apt-get -qq update ) fi
    - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then ( sudo apt-get install -y freeglut3-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libsqlite3-dev libgtk2.0-dev libwebkitgtk-dev mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 realpath p7zip-full ) fi
+   - if [[ "${TRAVIS_OS_NAME}" == "linux" && "${BOINC_TYPE}" == "unit-test" ]]; then ( sudo pip install codecov ) fi
    - if [[ "${BOINC_TYPE}" == "integration-test" ]]; then ( sudo apt-get install ansible/trusty-backports; sudo service mysql stop; ) fi
 
 before_script:
@@ -80,7 +81,7 @@ script:
 - if [[ "${BOINC_TYPE}" == "apps-mingw" ]]; then ( cd lib && MINGW=x86_64-w64-mingw32 make -f Makefile.mingw wrapper ) fi
 - if [[ "${BOINC_TYPE}" == "manager-osx" ]]; then ( ./3rdParty/buildMacDependencies.sh -q && ./mac_build/buildMacBOINC-CI.sh --no_shared_headers ) fi
 - if [[ "${BOINC_TYPE}" == "manager-android" ]]; then ( cd android && ./buildAndroidBOINC-CI.sh --arch arm --silent && ./buildAndroidBOINC-CI.sh --arch arm64 --silent && ./buildAndroidBOINC-CI.sh --arch x86 --silent && ./buildAndroidBOINC-CI.sh --arch x86_64 --silent && cd BOINC && ./gradlew assemble -w && cd ../../ ) fi
-- if [[ "${BOINC_TYPE}" == "unit-test" ]]; then ( /bin/true ) fi
+- if [[ "${BOINC_TYPE}" == "unit-test" ]]; then ( ./3rdParty/buildLinuxDependencies.sh --gtest-only && ./configure --disable-client --disable-manager --enable-unit-tests CFLAGS="-g -O0" CXXFLAGS="-g -O0" && make && ./tests/executeUnitTests.sh --report-coverage ) fi
 - if [[ "${BOINC_TYPE}" == "integration-test" ]]; then ( ./integration_test/executeTestSuite.sh ) fi
 
 after_success:

3rdParty/buildGoogletestLinux.sh

+#!/bin/bash
+
+# This file is part of BOINC.
+# http://boinc.berkeley.edu
+# Copyright (C) 2019 University of California
+#
+# BOINC is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# BOINC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+# Script to build a googletest library for BOINC
+
+# Usage:
+#  cd [path]/googletest-release-1.8.1/
+#  source path_to_this_script [--clean] [--prefix PATH]
+#
+# the --clean argument will force a full rebuild.
+# if --prefix is given as absolute path the library is installed into there
+
+doclean=""
+debug_flag=""
+lprefix=""
+cmdline_prefix=""
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        -clean|--clean)
+        doclean="yes"
+        ;;
+        -prefix|--prefix)
+        lprefix="$2"
+        cmdline_prefix="--prefix=${lprefix}"
+        shift
+        ;;
+    esac
+    shift # past argument or value
+done
+
+cd googletest
+autoreconf -i -f
+if [ $? -ne 0 ]; then cd ..; return 1; fi
+./configure "${cmdline_prefix}"
+if [ $? -ne 0 ]; then cd ..; return 1; fi
+if [ "${doclean}" = "yes" ]; then
+    make clean
+fi
+make
+if [ $? -ne 0 ]; then cd ..; return 1; fi
+
+# make install is not supported so copy files manually
+if [ "x${lprefix}" != "x" ]; then
+    mkdir -p ${lprefix}/lib ${lprefix}/include ${lprefix}/bin
+    (cp -r lib/.libs/*.a ${lprefix}/lib && cp -r include/gtest ${lprefix}/include && cp scripts/gtest-config ${lprefix}/bin)
+    if [ $? -ne 0 ]; then cd ..; return 1; fi
+fi
+
+cd ..
+return 0

3rdParty/buildLinuxDependencies.sh

@@ -2,7 +2,7 @@
 
 # This file is part of BOINC.
 # http://boinc.berkeley.edu
-# Copyright (C) 2017 University of California
+# Copyright (C) 2019 University of California
 #
 # BOINC is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License
@@ -51,6 +51,7 @@ ROOTDIR=$(pwd)
 cache_dir=""
 doclean=""
 wxoption=""
+gtest_only=""
 build_config="Release"
 while [[ $# -gt 0 ]]; do
     key="$1"
@@ -69,6 +70,9 @@ while [[ $# -gt 0 ]]; do
         --disable-webview)
         wxoption="--disable-webview ${wxoption} "
         ;;
+        --gtest-only)
+        gtest_only="yes"
+        ;;
         *)
         echo "unrecognized option $key"
         ;;
@@ -134,7 +138,11 @@ if [ "${doclean}" = "yes" ]; then
 fi
 
 #download_and_build $DIRNAME $FILENAME $DOWNLOADURL $BUILDSCRIPT
-download_and_build "wxWidgets-3.0.2" "wxWidgets-3.0.2.tar.bz2" "https://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.tar.bz2" "${ROOTDIR}/3rdParty/buildWxLinux.sh ${wxoption}"
+if [ "${gtest_only}" = "yes" ]; then
+    download_and_build "googletest-release-1.8.1" "release-1.8.1.tar.gz" "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" "${ROOTDIR}/3rdParty/buildGoogletestLinux.sh"
+else
+    download_and_build "wxWidgets-3.0.2" "wxWidgets-3.0.2.tar.bz2" "https://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.tar.bz2" "${ROOTDIR}/3rdParty/buildWxLinux.sh ${wxoption}"
+fi
 
 # change back to root directory
 cd ${ROOTDIR} || exit 1

Makefile.am

@@ -71,7 +71,7 @@ svn_version.h: generate_svn_version.sh
 # Add a stage target for staging a distribution
 
 clean-generic:
-	rm -rf stage
+	rm -rf stage *.gcov
 
 stage: all
 	if [ ! -d stage ] ; then mkdir stage ; fi

configure.ac

@@ -126,6 +126,12 @@ AC_ARG_ENABLE(apps,
     [enable_apps=${enableval}],
     [enable_apps=no])
 
+AC_ARG_ENABLE(unit-tests,
+    AS_HELP_STRING([--enable-unit-tests],
+                   [enable building the boinc unit tests]),
+    [enable_unit_tests=${enableval}],
+    [enable_unit_tests=no])
+
 AC_ARG_ENABLE(pkg-libs,
     AS_HELP_STRING([--enable-pkg-libs],
                    [Builds and installs components that would be present in a
@@ -139,8 +145,9 @@ AC_ARG_ENABLE(pkg-libs,
      enable_manager=no
      enable_install_headers=no
      enable_static=no
-	 enable_boinczip=yes
-	 enable_apps=no
+     enable_boinczip=yes
+     enable_apps=no
+     enable_unit_tests=no
     ],
     [])
 
@@ -156,8 +163,9 @@ AC_ARG_ENABLE(pkg-devel,
      enable_client=no
      enable_manager=no
      enable_install_headers=yes
-	 enable_boinczip=yes
-	 enable_apps=no
+     enable_boinczip=yes
+     enable_apps=no
+     enable_unit_tests=no
     ],
     [])
 
@@ -173,8 +181,9 @@ AC_ARG_ENABLE(pkg-client,
      enable_client=yes
      enable_manager=no
      enable_install_headers=no
-	 enable_boinczip=no
-	 enable_apps=no
+     enable_boinczip=no
+     enable_apps=no
+     enable_unit_tests=no
     ],
     [])
 
@@ -188,8 +197,9 @@ AC_ARG_ENABLE(pkg-manager,
      enable_client=no
      enable_manager=yes
      enable_install_headers=no
-	 enable_boinczip=no
-	 enable_apps=no
+     enable_boinczip=no
+     enable_apps=no
+     enable_unit_tests=no
     ],
     [])
 
@@ -213,6 +223,9 @@ fi
 if test x$enable_apps = xyes ; then
   configured_to_build="${configured_to_build} apps"
 fi
+if test x$enable_unit_tests = xyes ; then
+  configured_to_build="${configured_to_build} unit-tests"
+fi
 
 if test -z "${configured_to_build}" ; then
         AC_MSG_ERROR([
@@ -1049,6 +1062,7 @@ AM_CONDITIONAL(ENABLE_MANAGER, [ test "x${ac_cv_have_wxwidgets}" = xyes -a "${en
 AM_CONDITIONAL(ENABLE_LIBRARIES, [test "${enable_libraries}" = yes])
 AM_CONDITIONAL(ENABLE_BOINCZIP, [test "${enable_boinczip}" = yes])
 AM_CONDITIONAL(ENABLE_APPS, [test "${enable_apps}" = yes])
+AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "${enable_unit_tests}" = yes])
 AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "x${enable_server}" = xyes  || test "x${enable_client}" = xyes ])
 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])

lib/Makefile.am

@@ -244,7 +244,7 @@ $(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
 	$(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
 
 clean: clean-am
-	rm -f $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC_FCGI_STATIC)
+	rm -f $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC_FCGI_STATIC) *.gcno *.gcda *.gcov
 
 endif
 # end of "if ENABLE_LIBRARIES"

m4/boinc_set_compile_flags.m4

@@ -2,19 +2,19 @@ AC_DEFUN([BOINC_SET_COMPILE_FLAGS],[
 dnl  This function sets the compiler flags depending upon options
 dnl  set on the configure command line.
 
-AC_ARG_ENABLE(debug, 
+AC_ARG_ENABLE(debug,
     AS_HELP_STRING([--enable-debug],
                    [enable tracing and debugging flags for all components]),
     [enable_debug="$enableval"],
     [])
 
-AC_ARG_ENABLE(optimize, 
+AC_ARG_ENABLE(optimize,
     AS_HELP_STRING([--enable-optimize],
                    [enable optimization flags for all components]),
     [enable_optimize="$enableval"],
     [])
 
-AC_ARG_ENABLE(generic-processor, 
+AC_ARG_ENABLE(generic-processor,
     AS_HELP_STRING([--enable-generic-processor],
                    [build for a generic processor rather than a specific instruction set]),
     [enable_generic_processor="$enableval"],
@@ -34,7 +34,7 @@ if test x${enable_debug} = xyes ; then
   BOINC_CHECK_LDFLAG(-g)
   CXXFLAGS="$CXXFLAGS -DDEBUG -D_DEBUG"
   CFLAGS="$CFLAGS -DDEBUG -D_DEBUG"
-fi  
+fi
 
 if test x${enable_optimize} = xyes ; then
   if test x${ac_cv_c_compiler_gnu} = xyes ; then
@@ -49,17 +49,17 @@ if test x${enable_optimize} = xyes ; then
     BOINC_CHECK_CXXFLAG(-fast)
   fi
   BOINC_CHECK_CXXFLAG(-O3)
-fi  
+fi
 
 if test x${enable_generic_processor} = xyes ; then
    case ${target} in
-     i*86-*-darwin*) 
+     i*86-*-darwin*)
          BOINC_CHECK_CFLAG(-march=pentium4)
 	 BOINC_CHECK_CFLAG(-mtune=prescott)
          BOINC_CHECK_CXXFLAG(-march=pentium4)
 	 BOINC_CHECK_CXXFLAG(-mtune=prescott)
 	 ;;
-     i*86-*)  
+     i*86-*)
          dnl gcc
 	 if test x${ac_cv_c_compiler_gnu} = xyes ; then
            BOINC_CHECK_CFLAG(-march=i486)
@@ -78,19 +78,19 @@ if test x${enable_generic_processor} = xyes ; then
 	   BOINC_CHECK_CXXFLAG(-3)
 	 fi
 	 ;;
-     x86_64-*|amd64-*)  
+     x86_64-*|amd64-*)
          dnl gcc
 	 if test x${ac_cv_c_compiler_gnu} = xyes ; then
-           BOINC_CHECK_CFLAG(-msse2)   
-           BOINC_CHECK_CFLAG(-march=opteron)   
-           BOINC_CHECK_CFLAG(-mtune=generic)   
+           BOINC_CHECK_CFLAG(-msse2)
+           BOINC_CHECK_CFLAG(-march=opteron)
+           BOINC_CHECK_CFLAG(-mtune=generic)
          else
-           BOINC_CHECK_CFLAG(-xarch=amd64)   
+           BOINC_CHECK_CFLAG(-xarch=amd64)
          fi
 	 if test x${ac_cv_cxx_compiler_gnu} = xyes ; then
-           BOINC_CHECK_CXXFLAG(-msse2)   
-           BOINC_CHECK_CXXFLAG(-march=opteron)   
-           BOINC_CHECK_CXXFLAG(-mtune=generic)   
+           BOINC_CHECK_CXXFLAG(-msse2)
+           BOINC_CHECK_CXXFLAG(-march=opteron)
+           BOINC_CHECK_CXXFLAG(-mtune=generic)
          else
            BOINC_CHECK_CXXFLAG(-xarch=amd64)
          fi
@@ -98,23 +98,30 @@ if test x${enable_generic_processor} = xyes ; then
      sparc-*)
          dnl gcc
 	 if test x${ac_cv_c_compiler_gnu} = xyes ; then
-           BOINC_CHECK_CFLAG(-march=v8)   
-           BOINC_CHECK_CFLAG(-mcpu=v8)   
-           BOINC_CHECK_CFLAG(-mtune=ultrasparc)   
+           BOINC_CHECK_CFLAG(-march=v8)
+           BOINC_CHECK_CFLAG(-mcpu=v8)
+           BOINC_CHECK_CFLAG(-mtune=ultrasparc)
          else
 	 dnl Studio 10
-           BOINC_CHECK_CFLAG(-xarch=v8)   
+           BOINC_CHECK_CFLAG(-xarch=v8)
          fi
 	 if test x${ac_cv_cxx_compiler_gnu} = xyes ; then
-           BOINC_CHECK_CXXFLAG(-march=v8)   
-           BOINC_CHECK_CXXFLAG(-mcpu=v8)   
-           BOINC_CHECK_CXXFLAG(-mtune=ultrasparc)   
+           BOINC_CHECK_CXXFLAG(-march=v8)
+           BOINC_CHECK_CXXFLAG(-mcpu=v8)
+           BOINC_CHECK_CXXFLAG(-mtune=ultrasparc)
          else
-           BOINC_CHECK_CXXFLAG(-xarch=v8)   
+           BOINC_CHECK_CXXFLAG(-xarch=v8)
          fi
          ;;
      *)
          ;;
   esac
 fi
+
+if test x${enable_unit_tests} = xyes ; then
+  BOINC_CHECK_CFLAG(--coverage)
+  BOINC_CHECK_CXXFLAG(--coverage)
+  LDFLAGS="$LDFLAGS --coverage"
+fi
+
 ])

sched/Makefile.am

@@ -53,7 +53,7 @@ libsched_fcgi_la_LIBADD=
 endif
 # end of "if ENABLE_FCGI"
 
-# Some OSs may not prefix libraries with lib. 
+# Some OSs may not prefix libraries with lib.
 # For example OS2
 if OS_OS2
 LIBSCHED_STATIC=sched.${LIBEXT}
@@ -221,7 +221,7 @@ VALIDATOR_SOURCES = \
 	validate_util2.cpp
 
 sample_bitwise_validator_SOURCES = $(VALIDATOR_SOURCES) \
-	sample_bitwise_validator.cpp 
+	sample_bitwise_validator.cpp
 sample_bitwise_validator_LDADD = $(SERVERLIBS)
 
 sample_substr_validator_SOURCES = $(VALIDATOR_SOURCES) \
@@ -323,7 +323,7 @@ fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI)
 
 endif
 # end of "if ENABLE_FCGI"
-endif 
+endif
 # end of "if ENABLE_SERVER"
 
 .PHONY: PHONY-start
@@ -334,4 +334,4 @@ PHONY-start:
 status stop: PHONY-start
 	@test -f $@ || @LN_S@ start $@ && test -f $@
 
-CLEANFILES = status stop
+CLEANFILES = status stop *.gcno *.gcda *.gcov

tests/executeUnitTests.sh

+#!/bin/bash
+
+# This file is part of BOINC.
+# http://boinc.berkeley.edu
+# Copyright (C) 2019 University of California
+#
+# BOINC is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# BOINC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+# Script to execute googletest based unit tests for BOINC
+
+# Usage:
+#  ./tests/executeUnitTests.sh [--report-coverage] [--clean]
+#
+# if --report-coverage is given the test coverage will be reported to codecov.io
+# if --clean is given the tests will be rebuild from scratch otherwise an existing
+# build directory is used
+
+# check working directory because the script needs to be called like: ./tests/executeUnitTests.sh
+if [ ! -d "tests" ]; then
+    echo "start this script in the source root directory"
+    exit 1
+fi
+
+ROOTDIR=$(pwd)
+CI_RUN="${TRAVIS:-false}"
+report=""
+doclean=""
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case $key in
+        --report-coverage)
+        report="yes"
+        ;;
+        --clean)
+        doclean="yes"
+        ;;
+        *)
+        echo "unrecognized option $key"
+        ;;
+    esac
+    shift # past argument or value
+done
+
+command -v cmake >/dev/null 2>&1 || { echo >&2 "cmake is needed but not installed.  Aborting."; exit 1; }
+
+if [ "${report}" = "yes" ]; then
+    command -v gcov >/dev/null 2>&1 || { echo >&2 "gcov (lcov) is needed but not installed.  Aborting."; exit 1; }
+    command -v codecov >/dev/null 2>&1 || { echo >&2 "codecov (pip install codecov) is needed but not installed.  Aborting."; exit 1; }
+fi
+
+cd tests || exit 1
+if [[ "$doclean" = "yes" && -d "gtest" ]]; then
+    rm -rf gtest
+    if [ $? -ne 0 ]; then cd ..; exit 1; fi
+fi
+mkdir -p gtest
+if [ $? -ne 0 ]; then cd ..; exit 1; fi
+cd gtest
+cmake ../unit-tests
+if [ $? -ne 0 ]; then cd ../..; exit 1; fi
+make
+if [ $? -ne 0 ]; then cd ../..; exit 1; fi
+
+for T in lib sched; do
+    [ -d "${T}" ] && ./${T}/test_${T};
+done
+
+cd ../..
+if [ "${report}" = "yes" ]; then
+    #for T in lib sched; do
+    #    [ -d "${T}" ] && gcov -lp *.o >/dev/null;
+    #done
+    codecov
+fi

tests/unit-tests/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8)
+
+project(BOINC_unit_testing)
+enable_testing()
+
+set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_FLAGS "-g -Wall -Wextra -Werror --coverage")
+
+
+find_package(Threads REQUIRED)
+
+# There is no easy way to interface with the autotools driven build system in boinc
+# so the paths below are hardcoded and are mainly suited for building on Travis CI
+# TODO: make paths configurable and generate them from boinc make or switch boinc to cmake
+
+include_directories(BEFORE "${PROJECT_SOURCE_DIR}/../../3rdParty/buildCache/linux/include")
+include_directories("${PROJECT_SOURCE_DIR}/../..")
+include_directories("${PROJECT_SOURCE_DIR}/../../sched")
+include_directories("${PROJECT_SOURCE_DIR}/../../db")
+include_directories("${PROJECT_SOURCE_DIR}/../../lib")
+include_directories("${PROJECT_SOURCE_DIR}/../../tools")
+include_directories("/usr/include/mariadb")
+include_directories("/usr/include/mariadb/mysql")
+include_directories("/usr/include/mysql")
+
+
+find_library(GTEST_MAIN_LIB libgtest_main.a PATHS ${PROJECT_SOURCE_DIR}/../../3rdParty/buildCache/linux/lib NO_DEFAULT_PATH)
+message(STATUS "gtest_main_lib: ${GTEST_MAIN_LIB}")
+find_library(GTEST_LIB gtest PATHS ${PROJECT_SOURCE_DIR}/../../3rdParty/buildCache/linux/lib NO_DEFAULT_PATH)
+message(STATUS "gtest_lib: ${GTEST_LIB}")
+find_library(SCHED_LIB libsched.a PATHS ${PROJECT_SOURCE_DIR}/../../sched NO_DEFAULT_PATH)
+find_library(BOINC_CRYPT_LIB libboinc_crypt.a PATHS ${PROJECT_SOURCE_DIR}/../../lib NO_DEFAULT_PATH)
+find_library(BOINC_LIB libboinc.a PATHS ${PROJECT_SOURCE_DIR}/../../lib NO_DEFAULT_PATH)
+find_library(MYSQL_LIB NAMES mariadb mysqlclient)
+message(STATUS "mysql_lib: ${MYSQL_LIB}")
+
+add_subdirectory(lib)
+add_subdirectory(sched)

tests/unit-tests/lib/CMakeLists.txt

+file(GLOB SRCS *.cpp)
+
+add_executable(test_lib ${SRCS})
+
+TARGET_LINK_LIBRARIES(test_lib "${GTEST_LIB}" "${SCHED_LIB}" "${BOINC_CRYPT_LIB}" "${BOINC_LIB}" "${GTEST_MAIN_LIB}" pthread)
+
+add_test(NAME test_lib COMMAND test_lib)

tests/unit-tests/lib/test_str_util.cpp

+#include "gtest/gtest.h"
+#include "common_defs.h"
+#include "str_util.h"
+#include <string>
+#include <ios>
+
+namespace test_str_util {
+
+    // The fixture for testing class Foo.
+
+    class test_str_util : public ::testing::Test {
+    protected:
+        // You can remove any or all of the following functions if its body
+        // is empty.
+
+        test_str_util() {
+            // You can do set-up work for each test here.
+        }
+
+        virtual ~test_str_util() {
+            // You can do clean-up work that doesn't throw exceptions here.
+        }
+
+        // If the constructor and destructor are not enough for setting up
+        // and cleaning up each test, you can define the following methods:
+
+        virtual void SetUp() {
+            // Code here will be called immediately after the constructor (right
+            // before each test).
+        }
+
+        virtual void TearDown() {
+            // Code here will be called immediately after each test (right
+            // before the destructor).
+        }
+
+        // Objects declared here can be used by all tests in the test case for Foo.
+    };
+
+    // Tests that Foo does Xyz.
+
+    TEST_F(test_str_util, path_to_filename) {
+        std::string fname = "";
+        ASSERT_EQ(path_to_filename("/home/blah", fname), 0);
+        ASSERT_EQ(fname, "blah");
+        ASSERT_EQ(path_to_filename("hellokeith", fname), 0);
+        ASSERT_EQ(fname, "hellokeith");
+        fname = "";
+        ASSERT_EQ(path_to_filename("/home/blah/", fname), -2);
+        ASSERT_EQ(fname, "");
+        ASSERT_EQ(path_to_filename("", fname), -1);
+        ASSERT_EQ(fname, "");
+    }
+
+    TEST_F(test_str_util, nbytes_to_string) {
+        char buf[256];
+        nbytes_to_string(1024, 0, buf, sizeof (buf));
+        ASSERT_STREQ(buf, "1.00 KB");
+        nbytes_to_string(1024, 1024 * 1024, buf, sizeof (buf));
+        ASSERT_STREQ(buf, "0.00/1.00 MB");
+        nbytes_to_string(512, 1024, buf, sizeof (buf));
+        ASSERT_STREQ(buf, "0.50/1.00 KB");
+        nbytes_to_string(50000000000000, 0, buf, sizeof (buf));
+        ASSERT_STREQ(buf, "45.47 TB");
+    }
+
+    TEST_F(test_str_util, strip_whitespace) {
+        std::string tmp = "     white space   ";
+        strip_whitespace(tmp);
+        ASSERT_EQ(tmp, "white space");
+        tmp = "nospaces";
+        strip_whitespace(tmp);
+        ASSERT_EQ(tmp, "nospaces");
+    }
+
+    TEST_F(test_str_util, collapse_whitespace) {
+        std::string tmp = "     white space   ";
+        collapse_whitespace(tmp);
+        ASSERT_EQ(tmp, " white space ");
+        tmp = "nospaces";
+        collapse_whitespace(tmp);
+        ASSERT_EQ(tmp, "nospaces");
+        tmp = "inner     spaces";
+        collapse_whitespace(tmp);
+        ASSERT_EQ(tmp, "inner spaces");
+    }
+
+    TEST_F(test_str_util, is_valid_filename) {
+        //char tmp = "filename.txt";
+        bool ret = is_valid_filename("filename.txt");