Skip to content

Commit

Permalink
build: skip systemtests and test_crc32 on client-only build
Browse files Browse the repository at this point in the history
(cherry picked from commit 013335c)
  • Loading branch information
pstorz authored and arogge committed Feb 10, 2020
1 parent 77b75c0 commit a02e80f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions 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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/migrate.cc
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
16 changes: 8 additions & 8 deletions 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -332,7 +332,7 @@ if(NOT client-only)
${LMDB_LIBS}
${GTEST_LIBRARIES}
${GTEST_MAIN_LIBRARIES}
SKIP_GTEST
SKIP_GTEST
)
endif()

Expand Down

0 comments on commit a02e80f

Please sign in to comment.