From 9efb4d6ced9abfd404d988e1809b067481f259d6 Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Tue, 16 Jul 2019 16:53:46 +0200
Subject: [PATCH] tests: disable bconsole-pam test if pam_wrapper not available

- when disabled then the test is still shown in the log
- redirected output to dev/null while probing pam
---
 systemtests/CMakeLists.txt                    | 22 +++++++++++++++----
 .../bin/check_pam_exec_available.sh           |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
index c18d1ead0d9..ef0d4f8c5fc 100644
--- a/systemtests/CMakeLists.txt
+++ b/systemtests/CMakeLists.txt
@@ -17,9 +17,10 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.3)
 project(bareos-systemtests)
 
+cmake_policy(SET CMP0057 NEW) #IF(.. IN_LIST ..)
 
 function(ConfigureFilesToSystemtest srcdir subdirectory globexpression configure_option)
   set(count 1)
@@ -36,7 +37,11 @@ function(ConfigureFilesToSystemtest srcdir subdirectory globexpression configure
   MESSAGE(STATUS "Configured ${COUNT} files from ${srcdir} to ${subdirectory} with glob ${globexpression} ${configure_option}" )
 endfunction()
 
-
+macro(CheckForEnabledAndDisabledListEntry TEST_NAME_TO_CHECK)
+  IF(${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS AND ${TEST_NAME_TO_CHECK} IN_LIST SYSTEM_TESTS_DISABLED)
+    message(FATAL_ERROR "The test name: ${TEST_NAME} is listed ambiguously in SYSTEM_TESTS and SYSTEM_TESTS_DISABLED at the same time")
+  ENDIF()
+endmacro()
 
 # extract  db version from cats.h
 file(STRINGS ${CMAKE_SOURCE_DIR}/core/src/cats/cats.h DB_VERSION_STRING REGEX .*BDB_VERSION.*)
@@ -184,12 +189,18 @@ IF(PAM_WRAPPER_LIBRARIES) # BareosFindLibrary(pam_wrapper)
     )
     IF(${PAM_EXEC_AVAILABLE_RC} EQUAL "0")
       set(PAM_EXEC_FOUND TRUE)
-      list(APPEND SYSTEM_TESTS "bconsole-pam")
+      set(ENABLE_BCONSOLE_PAM_TEST TRUE)
     ENDIF()
-    MESSAGE( STATUS "PAM_EXEC_FOUND:     " ${PAM_EXEC_FOUND} )
   ENDIF()
 ENDIF()
 
+MESSAGE( STATUS "PAM_EXEC_FOUND:               " ${PAM_EXEC_FOUND} )
+
+IF(ENABLE_BCONSOLE_PAM_TEST)
+  list(APPEND SYSTEM_TESTS "bconsole-pam")
+ELSE()
+  list(APPEND SYSTEM_TESTS_DISABLED "bconsole-pam")
+ENDIF()
 
 set(BASEPORT 42001)
 
@@ -244,6 +255,8 @@ foreach(TEST_NAME ${SYSTEM_TESTS})
   configure_file("bin/bconsole" "tests/${TEST_NAME}/bin/bconsole" COPYONLY)
   configure_file("bin/bareos" "tests/${TEST_NAME}/bin/bareos" COPYONLY)
 
+  CheckForEnabledAndDisabledListEntry(${TEST_NAME})
+
   add_test(NAME "system:${TEST_NAME}"
     COMMAND ${tests_dir}/${TEST_NAME}/testrunner
     WORKING_DIRECTORY ${tests_dir}/${TEST_NAME})
@@ -253,6 +266,7 @@ foreach(TEST_NAME ${SYSTEM_TESTS})
 endforeach()
 
 foreach(TEST_NAME_DISABLED ${SYSTEM_TESTS_DISABLED})
+  CheckForEnabledAndDisabledListEntry(${TEST_NAME_DISABLED})
   add_test(NAME system:${TEST_NAME_DISABLED} COMMAND empty_command)
   set_tests_properties(system:${TEST_NAME_DISABLED} PROPERTIES DISABLED true)
   message(STATUS "Disabled test: system:${TEST_NAME_DISABLED}")
diff --git a/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh b/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
index 4e548635e62..6ed048dabf4 100755
--- a/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
+++ b/systemtests/tests/bconsole-pam/bin/check_pam_exec_available.sh
@@ -28,6 +28,6 @@ fi
 # PAM_WRAPPER_LIBRARIES will be set my cmake
 USERNAME="user"
 PASSWORD="user"
-echo "$PASSWORD" | LD_PRELOAD=${PAM_WRAPPER_LIBRARIES} pamtester bareos_discover_pam_exec "$USERNAME" authenticate
+echo "$PASSWORD" | LD_PRELOAD=${PAM_WRAPPER_LIBRARIES} pamtester bareos_discover_pam_exec "$USERNAME" authenticate > /dev/null 2>&1
 
 exit $?