google test

bareos · Dec 20, 2017 · 5715881 · 5715881
1 parent 65ac634
commit 5715881
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 23 deletions.
diff --git a/src/filed/accurate.h b/src/filed/accurate.h
@@ -27,7 +27,7 @@
  * Generic accurate payload is the same for any storage class.
  *
  * We store the lstat field as a character field as it makes storing of the
- * data much more efficient then storing it in a normal stat structure.
+ * data much more efficient than storing it in a normal stat structure.
  * Nowadays most of these structures are 64 bits and they will use 136
  * bytes (32 bits) and 128 bytes (64 bits) on Solaris. The ASCII encoding
  * of the lstat field most of the time is between 43 and 75 bytes with an

diff --git a/src/findlib/CMakeLists.txt b/src/findlib/CMakeLists.txt
@@ -41,4 +41,6 @@ set_target_properties(bareosfind PROPERTIES VERSION "${VERSION}"
                                           DEFINE_SYMBOL "BUILDING_DLL"
                                           )
 
-#add_subdirectory(unittests)
+IF (NOT HAVE_WIN32)
+   #   add_subdirectory(unittests)
+ENDIF()
diff --git a/src/findlib/unittests/CMakeLists.txt b/src/findlib/unittests/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(.. ../.. ../../include/)
 
 set (TEST_SRC
 #   drivetype_test.cc
-   fstype_test.cc
+#   fstype_test.cc
    )
 
 add_executable(test_findlib

diff --git a/src/findlib/unittests/fstype_test.cc b/src/findlib/unittests/fstype_test.cc
@@ -27,10 +27,10 @@
  * Philipp Storz, November 2017
  */
 
-#include <stdio.h>
 #include "bareos.h"
 #include "gtest/gtest.h"
 #include "findlib/find.h"
+#include <stdio.h>
 
 TEST(FstypeTest, RootFs) {
   char fs[1000];

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -107,4 +107,6 @@ set_target_properties(bareos PROPERTIES VERSION "${VERSION}"
 INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir})
 
 
-#add_subdirectory(unittests)
+IF(NOT HAVE_WIN32)
+   add_subdirectory(unittests)
+ENDIF()
diff --git a/src/lib/unittests/CMakeLists.txt b/src/lib/unittests/CMakeLists.txt
@@ -18,20 +18,21 @@
 #   02110-1301, USA.
 
 include_directories(.. ../.. ../../include/)
-
-link_libraries(kernel32 user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32)
-
+IF(HAVE_WIN32)
+   link_libraries(kernel32
+      user32 gdi32 winspool shell32 ole32 oleaut32 uuid comdlg32 advapi32)
+ENDIF()
 set (TEST_SRC
     alist_test.cc
     dlist_test.cc
-    base64_test.cc
-    bsnprintf_test.cc
+#    base64_test.cc
+#    bsnprintf_test.cc
 #   devlock_test.cc
-    edit_test.cc
+#    edit_test.cc
     htable_test.cc
-    junction_test.cc
+   #    junction_test.cc
 #    passphrase_test.cc
-    scan_test.cc
+#    scan_test.cc
 #   rwlock_test.cc
 #   sellist_test.cc
    #tree_test.cc

diff --git a/src/lib/unittests/alist_test.cc b/src/lib/unittests/alist_test.cc
@@ -27,9 +27,9 @@
  * Philipp Storz, November 2017
  */
 
-//#include "bareos.h"
-#include "windows.h"
 #include "gtest/gtest.h"
+#include "bareos.h"
+//#include "windows.h"
 
 struct FILESET {
    alist mylist;

diff --git a/src/lib/unittests/bsnprintf_test.cc b/src/lib/unittests/bsnprintf_test.cc
@@ -26,10 +26,10 @@
  *
  * Philipp Storz, November 2017
  */
-#include "bareos.h"
 #include "gtest/gtest.h"
-#include "../lib/protos.h"
-#include "protos.h"
+#include "bareos.h"
+/* #include "../lib/protos.h" */
+/* #include "protos.h" */
 
 
 TEST(bsnprintf, bsnprintf) {

diff --git a/src/lib/unittests/dlist_test.cc b/src/lib/unittests/dlist_test.cc
@@ -27,10 +27,10 @@
  * Philipp Storz, November 2017
  */
 
-#include "bareos.h"
 #include "gtest/gtest.h"
-#include "../lib/protos.h"
-#include "protos.h"
+#include "bareos.h"
+//#include "../lib/protos.h"
+//#include "protos.h"
 
 
 

diff --git a/src/lib/unittests/edit_test.cc b/src/lib/unittests/edit_test.cc
@@ -33,7 +33,6 @@
 #include "../lib/protos.h"
 #include "protos.h"
 
-
 void d_msg(const char*, int, int, const char*, ...) {}
 
 

diff --git a/src/lib/unittests/htable_test.cc b/src/lib/unittests/htable_test.cc
@@ -26,8 +26,8 @@
  *
  * Philipp Storz, November 2017
  */
-#include "bareos.h"
 #include "gtest/gtest.h"
+#include "bareos.h"
 #include "../lib/protos.h"
 #include "protos.h"