From ce2fc3ad115c922513e02a6bf277a2de078c2489 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 8 Dec 2007 01:00:19 +0000
Subject: [PATCH] Make regression tests work on 4.0

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7860 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/testing/regression | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/testing/regression b/tools/testing/regression
index cf8d14f8c..31c18f6c0 100755
--- a/tools/testing/regression
+++ b/tools/testing/regression
@@ -19,9 +19,18 @@
 #
 #
 
+case $(/sbin/shorewall version) in
+    4.0.*)
+	OPTIONS=vvv
+	;;
+    *)
+	OPTIONS=v2
+	;;
+esac
+
 for directory in *; do
     if [ -d $directory ]; then
-	if /sbin/shorewall -v2 compile -t $directory $directory/firewall > $directory/compileroutput 2> $directory/compilererrors; then
+	if /sbin/shorewall -${OPTIONS} compile -t $directory $directory/firewall > $directory/compileroutput 2> $directory/compilererrors; then
 	    if [ -f $directory/firewall.last ]; then
 		if diff -au $directory/firewall.last $directory/firewall > $directory/compare; then
 		    echo "Test $directory PASSED"