webui tests: enable running on installed files from package

bareos · Jan 24, 2020 · ac7e7bc · ac7e7bc
1 parent 4c50d96
commit ac7e7bc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
@@ -245,6 +245,7 @@ macro(prepare_testdir_for_daemon_run)
   set(piddir ${current_test_directory}/piddir)
 
   set(backenddir ${BACKEND_DIR_TO_TEST})
+  set(BAREOS_WEBUI_PUBLIC_DIR ${WEBUI_PUBLIC_DIR_TO_TEST})
 
   if(RUN_SYSTEMTESTS_ON_INSTALLED_FILES)
     set(bin /bin)
@@ -408,6 +409,8 @@ if(RUN_SYSTEMTESTS_ON_INSTALLED_FILES)
   set(SD_PLUGINS_DIR_TO_TEST ${PLUGINS_DIR_TO_TEST})
   set(DIR_PLUGINS_DIR_TO_TEST ${PLUGINS_DIR_TO_TEST})
   set(BACKEND_DIR_TO_TEST ${BACKEND_DIR_TO_TEST})
+  set(WEBUI_PUBLIC_DIR_TO_TEST /usr/share/bareos-webui/public)
+
 else() # run systemtests on source and compiled files
 
   foreach(BINARY ${ALL_BINARIES_BEING_USED_BY_SYSTEMTESTS})
@@ -420,13 +423,15 @@ else() # run systemtests on source and compiled files
   get_target_property(BACKEND_DIR_TO_TEST bareoscats BINARY_DIR)
 
   set(SCRIPTS_DIR_TO_TEST ${CMAKE_BINARY_DIR}/core/scripts)
+  set(WEBUI_PUBLIC_DIR_TO_TEST ${PROJECT_SOURCE_DIR}/../webui/public)
 
 endif()
 
-message("   FD_PLUGINS_DIR_TO_TEST: ${PLUGINS_DIR_TO_TEST}")
-message("   SD_PLUGINS_DIR_TO_TEST: ${PLUGINS_DIR_TO_TEST}")
-message("   DIR_PLUGINS_DIR_TO_TEST: ${PLUGINS_DIR_TO_TEST}")
+message("   FD_PLUGINS_DIR_TO_TEST: ${FD_PLUGINS_DIR_TO_TEST}")
+message("   SD_PLUGINS_DIR_TO_TEST: ${SD_PLUGINS_DIR_TO_TEST}")
+message("   DIR_PLUGINS_DIR_TO_TEST: ${DIR_PLUGINS_DIR_TO_TEST}")
 message("   BACKEND_DIR_TO_TEST: ${BACKEND_DIR_TO_TEST}")
+message("   WEBUI_PUBLIC_DIR_TO_TEST: ${WEBUI_PUBLIC_DIR_TO_TEST}")
 
 # extract  db version from cats.h
 file(STRINGS ${CMAKE_SOURCE_DIR}/core/src/cats/cats.h DB_VERSION_STRING

diff --git a/systemtests/environment.in b/systemtests/environment.in
@@ -92,6 +92,8 @@ export BAREOS_WEBUI_CLIENT_NAME=bareos-fd
 export BAREOS_WEBUI_RESTOREFILE=${PROJECT_BINARY_DIR}
 export BAREOS_WEBUI_LOG_PATH=${logdir}
 export BAREOS_WEBUI_DELAY=1
+export BAREOS_WEBUI_PUBLIC_DIR=@BAREOS_WEBUI_PUBLIC_DIR@
+
 
 #
 # oVirt Plugin Test

diff --git a/systemtests/tests/webui-common/testrunner.in b/systemtests/tests/webui-common/testrunner.in
@@ -36,7 +36,7 @@ END_OF_DATA
 
 run_bareos
 
-@PHP@ -S 127.0.0.1:@php_port@ -t @PROJECT_SOURCE_DIR@/../webui/public/ >"$tmp/php.out" 2>&1 &
+@PHP@ -S 127.0.0.1:@php_port@ -t @BAREOS_WEBUI_PUBLIC_DIR@ >"$tmp/php.out" 2>&1 &
 
 PHP_PID=$(echo $!)