From c8967ed18c6e5a175eb54628dbff60dc7f2c08fa Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 8 Jun 2018 13:06:58 -0300 Subject: [PATCH] Bug 20906: Fix translatable-templates.t From Jenkins: koha_1 | # Failed test 'staff_prog templates are translatable' koha_1 | # at xt/author/translatable-templates.t line 87. koha_1 | # Can't locate TmplTokenizer.pm in @INC (you may need to install the TmplTokenizer module) (@INC contains: /kohadevbox/koha /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.24.1 /usr/local/share/perl/5.24.1 /usr/lib/x86_64-linux-gnu/perl5/5.24 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.24 /usr/share/perl/5.24 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at ./tmpl_process3.pl line 20. On Stretch, '.' is not longer added to @INC, see bug 17717 for more info --- xt/author/translatable-templates.t | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xt/author/translatable-templates.t b/xt/author/translatable-templates.t index cf2f816a5c..b3ef5ff445 100644 --- a/xt/author/translatable-templates.t +++ b/xt/author/translatable-templates.t @@ -30,6 +30,8 @@ use File::Temp qw/tempdir/; use IPC::Open3; use File::Spec; use Symbol qw(gensym); +use FindBin qw($Bin); +use Cwd qw(abs_path); use utf8; my $po_dir = tempdir(CLEANUP => 1); @@ -46,7 +48,9 @@ opendir ( $dh, $staff_dir ) or die "can't opendir $staff_dir: $!"; my @staff_themes = grep { not /^\.|lib|js/ } readdir($dh); close $dh; -chdir "misc/translator"; # for now, tmpl_process3.pl works only if run from its directory +my $misc_translator_dir = abs_path("$Bin/../../misc/translator"); + +chdir $misc_translator_dir; # for now, tmpl_process3.pl works only if run from its directory # Check translatable of OPAC themes for my $theme ( @opac_themes ) { @@ -63,7 +67,7 @@ sub test_string_extraction { my $template_dir = shift; my $po_dir = shift; - my $command = "./tmpl_process3.pl create -i $template_dir -s $po_dir/$module.po -r --pedantic-warnings"; + my $command = "PERL5LIB=\$PERL5LIB:$misc_translator_dir ./tmpl_process3.pl create -i $template_dir -s $po_dir/$module.po -r --pedantic-warnings"; open (NULL, ">", File::Spec->devnull); print NULL "foo"; # avoid warning; -- 2.11.0