systemtests: add dedicated director config directory "additional_test…

…_config"

- the extra directory "additional_test_config" is prepared and cleaned for
  configuration enhancements that are only used in systemtests

systemtests/CMakeLists.txt

@@ -145,6 +145,7 @@ macro(prepare_test)
   # set(DEFAULT_DB_TYPE )
   set(archivedir ${current_test_directory}/storage)
   set(confdir ${current_test_directory}/etc/bareos)
+  set(config_directory_dir_additional_test_config ${current_test_directory}/etc/bareos/bareos-dir.d/additional_test_config)
 
   set(logdir ${current_test_directory}/log)
   set(tmpdir ${current_test_directory}/tmp)
@@ -159,6 +160,7 @@ macro(prepare_test)
   file(MAKE_DIRECTORY ${logdir})
   file(MAKE_DIRECTORY ${tmpdir})
   file(MAKE_DIRECTORY ${working_dir})
+  file(MAKE_DIRECTORY ${config_directory_dir_additional_test_config})
 endmacro()
 
 # extract  db version from cats.h

systemtests/environment.in

@@ -15,6 +15,8 @@ export confdir=${conf}
 configs=${conf}
 BAREOS_CONFIG_DIR=${conf}
 
+export config_directory_dir_additional_test_config=@config_directory_dir_additional_test_config@
+
 working=${current_test_directory}/working
 working_dir=${working}
 tmp=${current_test_directory}/tmp

systemtests/scripts/cleanup

@@ -14,6 +14,7 @@ rm -rf ${working}/*.mail
 rm -rf ${working}/CLEANUPMARKER
 rm -rf ${working}/plugins/*
 rm -rf ${archivedir}/*
+rm -f  ${config_directory_dir_additional_test_config}/*
 find . -name "gigaslam.gif" -exec rm -f {} \;
 # cleanup old config files
 # don't delete mtx-changer.conf (and other files?)