From 718f80eda24c887fa1e31b8142776351db64fe10 Mon Sep 17 00:00:00 2001 From: Simon Green Date: Tue, 13 Nov 2012 14:43:01 +0800 Subject: Bug 615627: Make t/012throwables.t know about user errors defined in extensions r=dkl, a=LpSolit --- t/012throwables.t | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 't/012throwables.t') diff --git a/t/012throwables.t b/t/012throwables.t index 6cb2688ca..7600cbd02 100644 --- a/t/012throwables.t +++ b/t/012throwables.t @@ -47,6 +47,13 @@ foreach my $include_path (@include_paths) { $file =~ s|\\|/|g if ON_WINDOWS; # convert \ to / in path if on windows $test_templates{$file} = () if $file =~ m#global/(code|user)-error\.html\.tmpl#; + + # Make sure the extension is not disabled + if ($file =~ m#^(extensions/[^/]+/)#) { + $test_templates{$file} = () + if ! -e "${1}disabled" + && $file =~ m#global/(code|user)-error-errors\.html\.tmpl#; + } } } @@ -59,7 +66,7 @@ plan tests => $tests; # Collect all errors defined in templates foreach my $file (keys %test_templates) { - $file =~ m|template/([^/]+).*/global/([^/]+)-error\.html\.tmpl|; + $file =~ m|template/([^/]+).*/global/([^/]+)-error(?:-errors)?\.html\.tmpl|; my $lang = $1; my $errtype = $2; -- cgit v1.2.3-24-g4f1b