From 186374529e05a18e216ee96675d80488289c9c42 Mon Sep 17 00:00:00 2001 From: Simon Green Date: Thu, 26 Sep 2013 12:20:02 +1000 Subject: Bug 893589 - 004template.t fails when templates in extension directory r=dkl, a=simon --- t/004template.t | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 't/004template.t') diff --git a/t/004template.t b/t/004template.t index c81bccc45..298bb52c0 100644 --- a/t/004template.t +++ b/t/004template.t @@ -37,17 +37,21 @@ my $fh; } # Check to make sure all templates that are referenced in Bugzilla -# exist in the proper place in the English template directory. +# exist in the proper place in the English template or extension directory. # All other languages may or may not include any template as Bugzilla will # fall back to English if necessary. foreach my $file (@referenced_files) { - my $path = File::Spec->catfile($english_default_include_path, $file); - if (-e $path) { - ok(1, "$path exists"); - } else { - ok(0, "$path cannot be located --ERROR"); + my $found = 0; + foreach my $path (@english_default_include_paths) { + my $pathfile = File::Spec->catfile($path, $file); + if (-e $pathfile) { + $found = 1; + last; + } } + + ok($found, "$file found"); } foreach my $include_path (@include_paths) { -- cgit v1.2.3-24-g4f1b