From: Fabian Keil <fk@fabiankeil.de>
Date: Mon, 15 Jun 2009 20:47:49 +0000 (+0000)
Subject: Let dependency_unsatisfied() properly deal with tests that depend on both config... 
X-Git-Tag: v_3_0_14~97
X-Git-Url: http://www.privoxy.org/gitweb/%40user-manual%40%40actions-help-prefix%40HIDE_IF_MODIFIED_SINCE?a=commitdiff_plain;h=bd3188f3abb78306f52d811f37629a1e751ed67f;p=privoxy.git

Let dependency_unsatisfied() properly deal with tests that depend on both config lines and features.
---

diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl
index 9fc4e992..ee0bd63e 100755
--- a/tools/privoxy-regression-test.pl
+++ b/tools/privoxy-regression-test.pl
@@ -7,7 +7,7 @@
 # A regression test "framework" for Privoxy. For documentation see:
 # perldoc privoxy-regression-test.pl
 #
-# $Id: privoxy-regression-test.pl,v 1.187 2009/06/15 17:11:38 fk Exp $
+# $Id: privoxy-regression-test.pl,v 1.188 2009/06/15 18:13:34 fk Exp $
 #
 # Wish list:
 #
@@ -601,7 +601,10 @@ sub dependency_unsatisfied ($) {
             }
         }
 
-    } elsif (defined ($dependencies{$level}{'feature status'})) {
+    }
+
+    if (defined ($dependencies{$level}{'feature status'})
+        and not defined $dependency_problem) {
 
         my $dependency = $dependencies{$level}{'feature status'};
         my ($feature, $status) = $dependency =~ /([^\s]*)\s+(Yes|No)/;