Commit d6661a06 authored by David Lawrence's avatar David Lawrence

Bug 666781 - t/008filter.t should not require filterexceptions.pl when one does…

Bug 666781 - t/008filter.t should not require filterexceptions.pl when one does not exist especially with extensions r/a=mkanat
parent cf489fc6
...@@ -61,11 +61,7 @@ foreach my $path (@Support::Templates::include_paths) { ...@@ -61,11 +61,7 @@ foreach my $path (@Support::Templates::include_paths) {
chdir $path; # relative path chdir $path; # relative path
# We load a %safe list of acceptable exceptions. # We load a %safe list of acceptable exceptions.
if (!-r "filterexceptions.pl") { if (-r "filterexceptions.pl") {
ok(0, "$path has templates but no filterexceptions.pl file. --ERROR");
next;
}
else {
do "filterexceptions.pl"; do "filterexceptions.pl";
if (ON_WINDOWS) { if (ON_WINDOWS) {
# filterexceptions.pl uses / separated paths, while # filterexceptions.pl uses / separated paths, while
...@@ -86,10 +82,12 @@ foreach my $path (@Support::Templates::include_paths) { ...@@ -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, # us to flag which members were not found, and report that as a warning,
# thereby keeping the lists clean. # thereby keeping the lists clean.
foreach my $file (keys %safe) { foreach my $file (keys %safe) {
my $list = $safe{$file}; if (ref $safe{$file} eq 'ARRAY') {
$safe{$file} = {}; my $list = $safe{$file};
foreach my $directive (@$list) { $safe{$file} = {};
$safe{$file}{$directive} = 0; foreach my $directive (@$list) {
$safe{$file}{$directive} = 0;
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment