From bf9156ad5f0a57a467dd46292efb2f0a47ec845e Mon Sep 17 00:00:00 2001 From: Marc Schumann Date: Wed, 31 Aug 2011 15:30:51 +0200 Subject: Bug 680729 - Testing suite (runtests.pl) incorrectly plans to do its existence check on referenced templates more than once. r=dkl; a=mkanat --- t/Support/Templates.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 't/Support') diff --git a/t/Support/Templates.pm b/t/Support/Templates.pm index 90b63a726..81dc8cc3f 100644 --- a/t/Support/Templates.pm +++ b/t/Support/Templates.pm @@ -29,12 +29,13 @@ use strict; use lib 't'; use base qw(Exporter); @Support::Templates::EXPORT = - qw(@languages @include_paths %include_path @referenced_files - %actual_files $num_actual_files); -use vars qw(@languages @include_paths %include_path @referenced_files - %actual_files $num_actual_files); + qw(@languages @include_paths $english_default_include_path + %include_path @referenced_files %actual_files $num_actual_files); +use vars qw(@languages @include_paths $english_default_include_path + %include_path @referenced_files %actual_files $num_actual_files); use Bugzilla; +use Bugzilla::Constants; use Bugzilla::Install::Util qw(template_include_path); use Support::Files; @@ -50,6 +51,10 @@ use File::Spec; # All include paths @include_paths = (); +# English default include path +$english_default_include_path = + File::Spec->catdir(bz_locations()->{'templatedir'}, 'en', 'default'); + # Files which are referenced in the cgi files @referenced_files = (); -- cgit v1.2.3-24-g4f1b