From 6192cbd8faaaab4fd9fe71606383f2c789157f88 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Tue, 23 Jan 2018 15:00:34 +0100 Subject: [PATCH] Update tests to reflect new style profile configuration --- include/tests_homedirs | 4 ++-- include/tests_time | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/tests_homedirs b/include/tests_homedirs index ce300f58..8944e33a 100644 --- a/include/tests_homedirs +++ b/include/tests_homedirs @@ -92,11 +92,11 @@ # Description : Scan home directories for specific files, used in different tests later # Notes : For performance reasons we combine the scanning of different files, so inode caching is used # as much as possible for every find command - # Profile opt : ignore_home_dir (multiple lines allowed), ignores home directory + # Profile opt : ignore-home-dir (multiple lines allowed), ignores home directory if [ ! -z "${REPORTFILE}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no HOME-9350 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Collecting information from home directories" if [ ${SKIPTEST} -eq 0 ]; then - IGNORE_HOME_DIRS=$(${GREPBINARY} "^config:ignore_home_dir:" ${PROFILE} | ${AWKBINARY} -F: '{ print $3 }') + IGNORE_HOME_DIRS=$(${GREPBINARY} "^ignore-home-dir[]=" ${REPORTFILE} | ${AWKBINARY} -F= '{ print $2 }') if [ -z "${IGNORE_HOME_DIRS}" ]; then LogText "Result: IGNORE_HOME_DIRS empty, no paths excluded" else diff --git a/include/tests_time b/include/tests_time index df35f0da..296813b4 100644 --- a/include/tests_time +++ b/include/tests_time @@ -259,7 +259,7 @@ else for ITEM in ${FIND}; do LogText "Found stratum 16 peer: ${ITEM}" - FIND2=$(${EGREPBINARY} "^ntp:ignore_stratum_16_peer:${ITEM}:" ${PROFILE}) + FIND2=$(${EGREPBINARY} "^ntp-ignore-stratum-16-peer=${ITEM}" ${PROFILE}) if IsEmpty "${FIND2}"; then COUNT=$((COUNT + 1)) Report "ntp_stratum_16_peer[]=${ITEM}"