From d6661a06f7a23885746d34df5452b22df5d95c6f Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 28 Jun 2011 16:46:35 -0400 Subject: Bug 666781 - t/008filter.t should not require filterexceptions.pl when one does not exist especially with extensions r/a=mkanat --- t/008filter.t | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/t/008filter.t b/t/008filter.t index a2f96ae3e..e73d23835 100644 --- a/t/008filter.t +++ b/t/008filter.t @@ -61,11 +61,7 @@ foreach my $path (@Support::Templates::include_paths) { chdir $path; # relative path # We load a %safe list of acceptable exceptions. - if (!-r "filterexceptions.pl") { - ok(0, "$path has templates but no filterexceptions.pl file. --ERROR"); - next; - } - else { + if (-r "filterexceptions.pl") { do "filterexceptions.pl"; if (ON_WINDOWS) { # filterexceptions.pl uses / separated paths, while @@ -86,10 +82,12 @@ foreach my $path (@Support::Templates::include_paths) { # us to flag which members were not found, and report that as a warning, # thereby keeping the lists clean. foreach my $file (keys %safe) { - my $list = $safe{$file}; - $safe{$file} = {}; - foreach my $directive (@$list) { - $safe{$file}{$directive} = 0; + if (ref $safe{$file} eq 'ARRAY') { + my $list = $safe{$file}; + $safe{$file} = {}; + foreach my $directive (@$list) { + $safe{$file}{$directive} = 0; + } } } -- cgit v1.2.3-24-g4f1b