diff options
author | Marc Schumann <wurblzap@gmail.com> | 2011-08-31 15:31:58 +0200 |
---|---|---|
committer | Marc Schumann <wurblzap@gmail.com> | 2011-08-31 15:31:58 +0200 |
commit | 205a682abdb486332a3bad9c33bec64ab6e148db (patch) | |
tree | 2dfdac7323a0ea484e45c491f4f284bdc256e88b /t/Support/Templates.pm | |
parent | bc484d1a273d1b74501e6d7504a85717bcc79ccb (diff) | |
download | bugs-205a682abdb486332a3bad9c33bec64ab6e148db.tar bugs-205a682abdb486332a3bad9c33bec64ab6e148db.tar.gz bugs-205a682abdb486332a3bad9c33bec64ab6e148db.tar.bz2 bugs-205a682abdb486332a3bad9c33bec64ab6e148db.tar.xz bugs-205a682abdb486332a3bad9c33bec64ab6e148db.zip |
Bug 680729 - Testing suite (runtests.pl) incorrectly plans to do its existence check on referenced templates more than once.
r=dkl; a=mkanat
Diffstat (limited to 't/Support/Templates.pm')
-rw-r--r-- | t/Support/Templates.pm | 13 |
1 files changed, 9 insertions, 4 deletions
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 = (); |