move cmocka to gtest

bareos · Dec 20, 2017 · 24d9d28 · 24d9d28
1 parent fbe99da
commit 24d9d28
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 19,358 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -580,7 +580,7 @@ MESSAGE("   ELASTO support:               ${have_elasto} ")
 MESSAGE("   Python support:               ${PYTHONLIBS_FOUND} ${PYTHONLIBS_VERSION_STRING} ${PYTHON_INCLUDE_PATH}")
 MESSAGE("   systemd support:              ${WITH_SYSTEMD} ${SYSTEMD_UNITDIR}")
 MESSAGE("   Batch insert enabled:         ${USE_BATCH_FILE_INSERT}")
-MESSAGE("   cmocka support:               ${CMOCKA_FOUND} ${CMOCKA_LIBRARIES} ${CMOCKA_INCLUDE_DIRS} ")
+MESSAGE("   gtest support:                ${GTEST_FOUND} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ")
 
 MESSAGE("   Dynamic cats backends:        ${dynamic-cats-backends} ${HAVE_DYNAMIC_CATS_BACKENDS} ")
 MESSAGE("   Dynamic storage backends:     ${dynamic-storage-backends} ${HAVE_DYNAMIC_SD_BACKENDS} ")

diff --git a/cmake/BareosFindAllLibraries.cmake b/cmake/BareosFindAllLibraries.cmake
@@ -51,12 +51,6 @@ BareosFindLibraryAndHeaders("pthread" "pthread.h")
 BareosFindLibraryAndHeaders("cap" "sys/capability.h")
 BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h")
 
-BareosFindLibraryAndHeaders("cmocka" "cmocka.h")
-if (${CMOCKA_FOUND})
-   SET(HAVE_CMOCKA 1)
-   SET(HAVE_CMOCKA_H 1)
-endif()
-
 BareosFindLibraryAndHeaders("lzo2" "lzo/lzoconf.h")
 if (${LZO2_FOUND})
    SET(HAVE_LZO 1)

diff --git a/doxygen/bareos.doxy b/doxygen/bareos.doxy
@@ -2027,7 +2027,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = ENABLE_NLS FSTYPE_MNTENT HAVE_ACL HAVE_ALLOCA HAVE_ALLOCA_H HAVE_ARPA_NAMESER_H HAVE_ASSERT_H HAVE_BACKTRACE HAVE_BACKTRACE_SYMBOLS HAVE_BCOPY HAVE_CMOCKA HAVE_CMOCKA_H HAVE_COMPRESS_BOUND HAVE_CRYPTO HAVE_CXXABI_H HAVE_DCGETTEXT HAVE_DIRENT_H HAVE_DLERROR HAVE_DLFCN_H HAVE_DYNAMIC_CATS_BACKENDS HAVE_EXECINFO_H HAVE_FASTLZ HAVE_FASTLZLIB_H HAVE_FCHDIR HAVE_FCHMOD HAVE_FCHOWN HAVE_FCNTL_H HAVE_FDATASYNC HAVE_FORK HAVE_FSEEKO HAVE_FUTIMENS HAVE_FUTIMES HAVE_GAI_STRERROR HAVE_GCC HAVE_GETADDRINFO HAVE_GETCWD HAVE_GETHOSTBYNAME2 HAVE_GETHOSTBYNAME_R HAVE_GETHOSTID HAVE_GETHOSTNAME HAVE_GETMNTENT HAVE_GETPAGESIZE HAVE_GETPID HAVE_GETTEXT HAVE_GETTIMEOFDAY HAVE_GLOB HAVE_GLOB_H HAVE_GRP_H HAVE_INET_NTOP HAVE_INET_PTON HAVE_INT64_T HAVE_INTMAX_T HAVE_INTPTR_T HAVE_INTTYPES_H HAVE_INTXX_T HAVE_IOCTL_ULINT_REQUEST HAVE_IPV6 HAVE_JANSSON HAVE_LCHOWN HAVE_LGETXATTR HAVE_LIBCAP HAVE_LIBDL HAVE_LIBDLLOADER HAVE_LIBUTIL HAVE_LIBZ HAVE_LIMITS_H HAVE_LINUX_OS HAVE_LITTLE_ENDIAN HAVE_LLISTXATTR HAVE_LMDB HAVE_LOCALTIME_R HAVE_LOWLEVEL_SCSI_INTERFACE HAVE_LSETXATTR HAVE_LSTAT HAVE_LUTIMES HAVE_LZO HAVE_LZO_LZO1X_H HAVE_LZO_LZOCONF_H HAVE_MALLOC_TRIM HAVE_MEMORY_H HAVE_NANOSLEEP HAVE_NDMP HAVE_NL_LANGINFO HAVE_OPENSSL HAVE_POLL HAVE_POLL_H HAVE_POSIX_FADVISE HAVE_POSIX_SIGNALS HAVE_PRCTL HAVE_PUTENV HAVE_PWD_H HAVE_PYTHON HAVE_READDIR_R HAVE_READLINE HAVE_REGEX_H HAVE_SCSI_SCSI_H HAVE_SCSI_SG_H HAVE_SELECT HAVE_SETENV HAVE_SETJMP_H HAVE_SETPGID HAVE_SETPGRP HAVE_SETREUID HAVE_SETSID HAVE_SHA2 HAVE_SIGNAL HAVE_SNPRINTF HAVE_SOCKLEN_T HAVE_SQLITE3 HAVE_SQLITE3_THREADSAFE HAVE_STDARG_H HAVE_STDINT_H HAVE_STDLIB_H HAVE_STRCASECMP HAVE_STRERROR HAVE_STRERROR_R HAVE_STRFTIME HAVE_STRINGS_H HAVE_STRING_H HAVE_STRNCMP HAVE_STRNCPY HAVE_STRTOLL HAVE_STRUCT_STAT_ST_BLKSIZE HAVE_STRUCT_STAT_ST_BLOCKS HAVE_STRUCT_STAT_ST_RDEV HAVE_STRUCT_TM_TM_ZONE HAVE_ST_BLKSIZE HAVE_ST_BLOCKS HAVE_ST_RDEV HAVE_SYSTEMD HAVE_SYS_ACL_H HAVE_SYS_BITYPES_H HAVE_SYS_CAPABILITY_H HAVE_SYS_IOCTL_H HAVE_SYS_MTIO_H HAVE_SYS_POLL_H HAVE_SYS_PRCTL_H HAVE_SYS_SELECT_H HAVE_SYS_SOCKET_H HAVE_SYS_STATVFS_H HAVE_SYS_STAT_H HAVE_SYS_TIME_H HAVE_SYS_TYPES_H HAVE_SYS_WAIT_H HAVE_SYS_XATTR_H HAVE_TCGETATTR HAVE_TERMCAP_H HAVE_TERMIOS_H HAVE_TERM_H HAVE_TLS HAVE_TM_ZONE HAVE_TYPEOF HAVE_UINTPTR_T HAVE_UNISTD_H HAVE_UTIMES HAVE_UTIME_H HAVE_U_INT HAVE_U_INT64_T HAVE_U_INTXX_T HAVE_VA_COPY HAVE_VFPRINTF HAVE_VPRINTF HAVE_VSNPRINTF HAVE_XATTR HAVE_ZLIB_H IS_BUILD_ON_OBS LIBDIR LOCALEDIR LT_OBJDIR PACKAGE_BUGREPORT PACKAGE_NAME PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION PROTOTYPES RETSIGTYPE SETPGRP_VOID SIZEOF_CHAR SIZEOF_INT SIZEOF_INT_P SIZEOF_LONG_INT SIZEOF_LONG_LONG_INT SIZEOF_SHORT_INT SMARTALLOC STDC_HEADERS SYSCONFDIR TIME_WITH_SYS_TIME USE_BATCH_FILE_INSERT _FILE_OFFSET_BITS _LARGEFILE_SOURCE _LARGE_FILES _PATH_BAREOS_BACKENDDIR _PATH_BAREOS_PIDDIR _PATH_BAREOS_WORKINGDIR lld llu major_t minor_t
+PREDEFINED             = ENABLE_NLS FSTYPE_MNTENT HAVE_ACL HAVE_ALLOCA HAVE_ALLOCA_H HAVE_ARPA_NAMESER_H HAVE_ASSERT_H HAVE_BACKTRACE HAVE_BACKTRACE_SYMBOLS HAVE_BCOPY HAVE_COMPRESS_BOUND HAVE_CRYPTO HAVE_CXXABI_H HAVE_DCGETTEXT HAVE_DIRENT_H HAVE_DLERROR HAVE_DLFCN_H HAVE_DYNAMIC_CATS_BACKENDS HAVE_EXECINFO_H HAVE_FASTLZ HAVE_FASTLZLIB_H HAVE_FCHDIR HAVE_FCHMOD HAVE_FCHOWN HAVE_FCNTL_H HAVE_FDATASYNC HAVE_FORK HAVE_FSEEKO HAVE_FUTIMENS HAVE_FUTIMES HAVE_GAI_STRERROR HAVE_GCC HAVE_GETADDRINFO HAVE_GETCWD HAVE_GETHOSTBYNAME2 HAVE_GETHOSTBYNAME_R HAVE_GETHOSTID HAVE_GETHOSTNAME HAVE_GETMNTENT HAVE_GETPAGESIZE HAVE_GETPID HAVE_GETTEXT HAVE_GETTIMEOFDAY HAVE_GLOB HAVE_GLOB_H HAVE_GRP_H HAVE_INET_NTOP HAVE_INET_PTON HAVE_INT64_T HAVE_INTMAX_T HAVE_INTPTR_T HAVE_INTTYPES_H HAVE_INTXX_T HAVE_IOCTL_ULINT_REQUEST HAVE_IPV6 HAVE_JANSSON HAVE_LCHOWN HAVE_LGETXATTR HAVE_LIBCAP HAVE_LIBDL HAVE_LIBDLLOADER HAVE_LIBUTIL HAVE_LIBZ HAVE_LIMITS_H HAVE_LINUX_OS HAVE_LITTLE_ENDIAN HAVE_LLISTXATTR HAVE_LMDB HAVE_LOCALTIME_R HAVE_LOWLEVEL_SCSI_INTERFACE HAVE_LSETXATTR HAVE_LSTAT HAVE_LUTIMES HAVE_LZO HAVE_LZO_LZO1X_H HAVE_LZO_LZOCONF_H HAVE_MALLOC_TRIM HAVE_MEMORY_H HAVE_NANOSLEEP HAVE_NDMP HAVE_NL_LANGINFO HAVE_OPENSSL HAVE_POLL HAVE_POLL_H HAVE_POSIX_FADVISE HAVE_POSIX_SIGNALS HAVE_PRCTL HAVE_PUTENV HAVE_PWD_H HAVE_PYTHON HAVE_READDIR_R HAVE_READLINE HAVE_REGEX_H HAVE_SCSI_SCSI_H HAVE_SCSI_SG_H HAVE_SELECT HAVE_SETENV HAVE_SETJMP_H HAVE_SETPGID HAVE_SETPGRP HAVE_SETREUID HAVE_SETSID HAVE_SHA2 HAVE_SIGNAL HAVE_SNPRINTF HAVE_SOCKLEN_T HAVE_SQLITE3 HAVE_SQLITE3_THREADSAFE HAVE_STDARG_H HAVE_STDINT_H HAVE_STDLIB_H HAVE_STRCASECMP HAVE_STRERROR HAVE_STRERROR_R HAVE_STRFTIME HAVE_STRINGS_H HAVE_STRING_H HAVE_STRNCMP HAVE_STRNCPY HAVE_STRTOLL HAVE_STRUCT_STAT_ST_BLKSIZE HAVE_STRUCT_STAT_ST_BLOCKS HAVE_STRUCT_STAT_ST_RDEV HAVE_STRUCT_TM_TM_ZONE HAVE_ST_BLKSIZE HAVE_ST_BLOCKS HAVE_ST_RDEV HAVE_SYSTEMD HAVE_SYS_ACL_H HAVE_SYS_BITYPES_H HAVE_SYS_CAPABILITY_H HAVE_SYS_IOCTL_H HAVE_SYS_MTIO_H HAVE_SYS_POLL_H HAVE_SYS_PRCTL_H HAVE_SYS_SELECT_H HAVE_SYS_SOCKET_H HAVE_SYS_STATVFS_H HAVE_SYS_STAT_H HAVE_SYS_TIME_H HAVE_SYS_TYPES_H HAVE_SYS_WAIT_H HAVE_SYS_XATTR_H HAVE_TCGETATTR HAVE_TERMCAP_H HAVE_TERMIOS_H HAVE_TERM_H HAVE_TLS HAVE_TM_ZONE HAVE_TYPEOF HAVE_UINTPTR_T HAVE_UNISTD_H HAVE_UTIMES HAVE_UTIME_H HAVE_U_INT HAVE_U_INT64_T HAVE_U_INTXX_T HAVE_VA_COPY HAVE_VFPRINTF HAVE_VPRINTF HAVE_VSNPRINTF HAVE_XATTR HAVE_ZLIB_H IS_BUILD_ON_OBS LIBDIR LOCALEDIR LT_OBJDIR PACKAGE_BUGREPORT PACKAGE_NAME PACKAGE_STRING PACKAGE_TARNAME PACKAGE_URL PACKAGE_VERSION PROTOTYPES RETSIGTYPE SETPGRP_VOID SIZEOF_CHAR SIZEOF_INT SIZEOF_INT_P SIZEOF_LONG_INT SIZEOF_LONG_LONG_INT SIZEOF_SHORT_INT SMARTALLOC STDC_HEADERS SYSCONFDIR TIME_WITH_SYS_TIME USE_BATCH_FILE_INSERT _FILE_OFFSET_BITS _LARGEFILE_SOURCE _LARGE_FILES _PATH_BAREOS_BACKENDDIR _PATH_BAREOS_PIDDIR _PATH_BAREOS_WORKINGDIR lld llu major_t minor_t
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

diff --git a/src/dird/unittests/ndmp_fhdb_test.cc b/src/dird/unittests/ndmp_fhdb_test.cc