From a02e80fa6bd1cb338083b61b23a5c57b156d6414 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Mon, 10 Feb 2020 11:33:11 +0100
Subject: [PATCH] build: skip systemtests and test_crc32 on client-only build

(cherry picked from commit 013335c11e1ff612d37f6ef165a0c9bf484954df)
---
 CMakeLists.txt                |  6 ++++--
 core/src/dird/migrate.cc      |  4 ++--
 core/src/tests/CMakeLists.txt | 16 ++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8954f0d4415..44237f37746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2019-2020 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -67,7 +67,9 @@ endif()
 if(BUILD_BAREOS_BINARIES)
   add_subdirectory(core)
   add_subdirectory(webui)
-  add_subdirectory(systemtests)
+  if (NOT client-only)
+    add_subdirectory(systemtests)
+  endif()
 endif()
 
 if(docs
diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc
index 5d5345523d1..e840fec9210 100644
--- a/core/src/dird/migrate.cc
+++ b/core/src/dird/migrate.cc
@@ -3,7 +3,7 @@
 
    Copyright (C) 2004-2012 Free Software Foundation Europe e.V.
    Copyright (C) 2011-2016 Planets Communications B.V.
-   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2020 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -278,7 +278,7 @@ bool SetMigrationWstorage(JobControlRecord* jcr,
 
 /**
  * SetMigrationNextPool() called by DoMigrationInit()
- * at differents stages.
+ * at different stages.
  *
  * The idea here is to make a common subroutine for the
  * NextPool's search code and to permit DoMigrationInit()
diff --git a/core/src/tests/CMakeLists.txt b/core/src/tests/CMakeLists.txt
index efb40756339..142a4b8b486 100644
--- a/core/src/tests/CMakeLists.txt
+++ b/core/src/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2019 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2020 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -267,13 +267,13 @@ if(NOT client-only)
   )
 endif() # NOT client-only
 
-bareos_add_test(
-  test_crc32
-  ADDITIONAL_SOURCES ../stored/crc32/crc32.cc
-  LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
-)
-
 if(NOT client-only)
+  bareos_add_test(
+    test_crc32
+    ADDITIONAL_SOURCES ../stored/crc32/crc32.cc
+    LINK_LIBRARIES bareos ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
+  )
+
   bareos_add_test(
     test_fileindex_list
     LINK_LIBRARIES
@@ -332,7 +332,7 @@ if(NOT client-only)
       ${LMDB_LIBS}
       ${GTEST_LIBRARIES}
       ${GTEST_MAIN_LIBRARIES}
-    SKIP_GTEST
+      SKIP_GTEST
   )
 endif()