From 2886ad0b7e71f493ecc6c1b0a6840d50bbfdb59f Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Tue, 19 Apr 2016 12:38:00 +0200
Subject: [PATCH] Allow skipping of tests

---
 include/profiles | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/profiles b/include/profiles
index 1c46df9d..541b8489 100644
--- a/include/profiles
+++ b/include/profiles
@@ -26,9 +26,9 @@
 
     for PROFILE in ${PROFILES}; do
         logtext "Reading profile/configuration ${PROFILE}"
-        FIND=`egrep "^config:|^[a-z].*=" ${PROFILE} | sed 's/ /!space!/g'`
+        FIND=`egrep "^config:|^[a-z-].*=" ${PROFILE} | sed 's/ /!space!/g'`
         for I in ${FIND}; do
-            if ContainsString ":" "${I}"; then
+            if ContainsString "config:" "${I}"; then
                 # Old style configuration
                 OPTION=`echo ${I} | cut -d ':' -f2`
                 VALUE=`echo ${I} | cut -d ':' -f3 | sed 's/!space!/ /g'`
@@ -36,7 +36,7 @@
                 OPTION=`echo ${I} | cut -d '=' -f1`
                 VALUE=`echo ${I} | cut -d '=' -f2 | sed 's/!space!/ /g'`
             fi
-            logtext "Profile option set: ${OPTION} (with value ${VALUE})"
+            Debug "Profile option set: ${OPTION} (with value ${VALUE})"
 
             case ${OPTION} in
 
@@ -167,6 +167,11 @@
                     SHOW_TOOL_TIPS="${VALUE}"
                 ;;
 
+                # Which tests to skip (skip-test=ABCD-1234 or skip-test=ABCD-1234:subtest)
+                skip-test)
+                    SKIP_TESTS="${SKIP_TESTS} ${VALUE}"
+                ;;
+
                 # Tests to always skip (useful for false positives or problematic tests)
                 test_skip_always)
                     TEST_SKIP_ALWAYS="${VALUE}"
@@ -255,6 +260,10 @@
     done
 #
 #################################################################################
+#
+    Logtext "Skip tests: ${SKIP_TESTS}"
+#
+#################################################################################
 #
     # Add group name to report
     if [ ! "${GROUP_NAME}" = "" ]; then