From 5f99ef789c3e549feb28a974f0ea9b76b5eafa76 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 25 May 2009 19:33:08 +0000 Subject: [PATCH] Streamline elsif condition. White space fixes. --- tools/privoxy-regression-test.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl index 902b61bb..03d4f0cb 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.171 2009/05/19 14:34:49 fk Exp $ +# $Id: privoxy-regression-test.pl,v 1.172 2009/05/25 19:31:42 fk Exp $ # # Wish list: # @@ -730,15 +730,18 @@ sub execute_sticky_actions_test ($) { my $final_results = get_final_results($url); foreach my $sticky_action (@sticky_actions) { + if (defined $final_results->{$sticky_action}) { # Exact match $verified_actions++; - }elsif ($sticky_action =~ /-.*\{/ and - not defined $final_results->{$sticky_action}) { + + } elsif ($sticky_action =~ /-.*\{/ { + # Disabled multi actions aren't explicitly listed as # disabled and thus have to be checked by verifying # that they aren't enabled. $verified_actions++; + } else { l(LL_VERBOSE_FAILURE, "Ooops. '$sticky_action' is not among the final results."); -- 2.39.2