From a0b20fcfe352a913054f3ba95d660142c69402ec Mon Sep 17 00:00:00 2001
From: Roland Smith <rsmith@xs4all.nl>
Date: Mon, 27 Apr 2015 18:26:39 +0200
Subject: [PATCH] Wrap ipfw test in SKIPTEST block.

---
 include/tests_firewalls | 42 +++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/include/tests_firewalls b/include/tests_firewalls
index 3e23fb95..28143f1f 100644
--- a/include/tests_firewalls
+++ b/include/tests_firewalls
@@ -276,29 +276,31 @@
     # Test        : FIRE-4530
     # Description : Check ipfw (FreeBSD)
     Register --test-no FIRE-4530 --os FreeBSD --weight L --network NO --description "Check ipfw status"
-    if [ ! "${SYSCTLBINARY}" = "" ]; then
-        # For now, only check for IPv4.
-        FIND=`${SYSCTLBINARY} net.inet.ip.fw.enable | awk '{ print $2 }'`
-        if [ "${FIND}" = "1" ]; then
-            Display --indent 2 --text "- Checking ipfw status" --result RUNNING --color GREEN
-            logtext "Result: ipfw is running for IPv4"
-            FIREWALL_ACTIVE=1
-            FIREWALL_SOFTWARE="ipfw"
-            IPFW_ENABLED=`service -e | grep -o ipfw`
-            if [ "${IPFW_ENABLED}" = "ipfw" ]; then
-                Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result YES --color GREEN
-                logtext "Result: ipfw is enabled at start-up for IPv4"
+    if [ ${SKIPTEST} -eq 0 ]; then
+        if [ ! "${SYSCTLBINARY}" = "" ]; then
+            # For now, only check for IPv4.
+            FIND=`${SYSCTLBINARY} net.inet.ip.fw.enable | awk '{ print $2 }'`
+            if [ "${FIND}" = "1" ]; then
+                Display --indent 2 --text "- Checking ipfw status" --result RUNNING --color GREEN
+                logtext "Result: ipfw is running for IPv4"
+                FIREWALL_ACTIVE=1
+                FIREWALL_SOFTWARE="ipfw"
+                IPFW_ENABLED=`service -e | grep -o ipfw`
+                if [ "${IPFW_ENABLED}" = "ipfw" ]; then
+                    Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result YES --color GREEN
+                    logtext "Result: ipfw is enabled at start-up for IPv4"
+                else
+                    Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result NO --color YELLOW
+                    logtext "Result: ipfw is disabled at start-up for IPv4"
+                fi
             else
-                Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result NO --color YELLOW
-                logtext "Result: ipfw is disabled at start-up for IPv4"
+                Display --indent 2 --text "- Checking ipfw status" --result "NOT RUNNING" --color YELLOW
+                logtext "Result: ipfw is not running for IPv4"
             fi
-          else
-            Display --indent 2 --text "- Checking ipfw status" --result "NOT RUNNING" --color YELLOW
-            logtext "Result: ipfw is not running for IPv4"
+        else
+            Display --indent 2 --text "- Checking ipfw" --result SKIPPED --color YELLOW
+            ReportException "${TEST_NO}:4" "No IPFW test available (sysctl missing)"
         fi
-    else
-        Display --indent 2 --text "- Checking ipfw" --result SKIPPED --color YELLOW
-        ReportException "${TEST_NO}:4" "No IPFW test available (sysctl missing)"
     fi
 #
 #################################################################################