Skip to content
Permalink
Browse files

Merge pull request #260 from bareos/dev/joergs/master/systemtest-pyth…

…on-fd

systemtests: run python-fd-plugin-local-fileset-test only if python-fd is build
  • Loading branch information...
arogge committed Sep 10, 2019
2 parents 76a11af + 22c69f8 commit 9911edc5e8ff76df9685d99b54c7a5cb26041ed4
Showing with 12 additions and 10 deletions.
  1. +12 −10 systemtests/CMakeLists.txt
@@ -100,12 +100,14 @@ set(python_plugin_module_src_dir ${CMAKE_SOURCE_DIR}/core/src/plugins)
set(plugindirtmp ${PROJECT_BINARY_DIR}/plugindirtmp)
set(rscripts ${PROJECT_BINARY_DIR}/scripts)

if(PYTHONLIBS_FOUND)
get_target_property(fd_plugin_binary_path python-fd BINARY_DIR)
if(NOT client-only)
if(TARGET python-dir)
get_target_property(dir_plugin_binary_path python-dir BINARY_DIR)
endif()
if(TARGET python-sd)
get_target_property(sd_plugin_binary_path python-sd BINARY_DIR)
endif()
endif()
if(TARGET python-fd)
get_target_property(fd_plugin_binary_path python-fd BINARY_DIR)
endif()

set(sbindir ${PROJECT_BINARY_DIR}/sbin)
@@ -218,6 +220,12 @@ ELSE()
list(APPEND SYSTEM_TESTS_DISABLED "bconsole-pam")
ENDIF()

IF(TARGET python-fd)
list(APPEND SYSTEM_TESTS "python-fd-plugin-local-fileset-test")
ELSE()
list(APPEND SYSTEM_TESTS_DISABLED "python-fd-plugin-local-fileset-test")
ENDIF()

SET(PHP_FOUND FALSE)
SET(PYTHON_FOUND FALSE)
SET(PYTHON_SELENIUM_FOUND "NOT SEARCHED")
@@ -251,12 +259,6 @@ ELSE()
list(APPEND SYSTEM_TESTS_DISABLED "webui-selenium")
ENDIF()

IF(PYTHONLIBS_FOUND)
list(APPEND SYSTEM_TESTS "python-fd-plugin-local-fileset-test")
ELSE()
list(APPEND SYSTEM_TESTS_DISABLED "python-fd-plugin-local-fileset-test")
ENDIF()

set(BASEPORT 42001)

foreach(TEST_NAME ${SYSTEM_TESTS})

0 comments on commit 9911edc

Please sign in to comment.
You can’t perform that action at this time.