cmake: add sd_backenddir to the environment and config of droplet-test

bareos · Jul 20, 2020 · 9eb3c9f · 9eb3c9f
1 parent bf512b6
commit 9eb3c9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
@@ -307,6 +307,7 @@ macro(prepare_testdir_for_daemon_run)
   set(piddir ${current_test_directory}/piddir)
 
   set(backenddir ${BACKEND_DIR_TO_TEST})
+  set(sd_backenddir ${SD_BACKEND_DIR})
   set(BAREOS_WEBUI_PUBLIC_DIR ${WEBUI_PUBLIC_DIR_TO_TEST})
 
   if(RUN_SYSTEMTESTS_ON_INSTALLED_FILES)
@@ -487,6 +488,7 @@ else() # run systemtests on source and compiled files
 
   get_target_property(FD_PLUGINS_DIR_TO_TEST bpipe-fd BINARY_DIR)
   get_target_property(SD_PLUGINS_DIR_TO_TEST autoxflate-sd BINARY_DIR)
+  get_target_property(SD_BACKEND_DIR bareossd-droplet BINARY_DIR)
   if(TARGET bareossd-gfapi)
     get_target_property(SD_GFAPI_DIR_TO_TEST bareossd-gfapi BINARY_DIR)
   endif()

diff --git a/systemtests/environment.in b/systemtests/environment.in
@@ -35,6 +35,7 @@ archivedir=@archivedir@
 logdir=@logdir@
 
 export backenddir=@backenddir@
+export sd_backenddir=@sd_backenddir@
 
 export dir_password=@dir_password@
 export sd_password=@sd_password@

diff --git a/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,6 +8,7 @@ Storage {
   #
   # Plugin Directory = "@python_plugin_module_src_sd@"
   # Plugin Names = ""
+  BackendDirectory = "@sd_backenddir@"
   Working Directory =  "@working_dir@"
   Pid Directory =  "@piddir@"
   SD Port = @sd_port@