From 5f310e5b9e7afbd5badb17178349fefaaabfacce Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Thu, 30 Jun 2016 23:32:40 -0400 Subject: Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master + local symlink to data/ directory --- t/010dependencies.t | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 't/010dependencies.t') diff --git a/t/010dependencies.t b/t/010dependencies.t index 3289d098e..777d42ed1 100644 --- a/t/010dependencies.t +++ b/t/010dependencies.t @@ -1,27 +1,20 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code are the Bugzilla Tests. -# -# Contributor(s): David Miller -# Frédéric Buclin +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. ################## #Bugzilla Test 10# ## dependencies ## +use 5.10.1; use strict; -use lib qw(. lib t); +use warnings; + +use lib qw(. lib local/lib/perl5 t); use Support::Files; use Test::More qw(no_plan); @@ -37,7 +30,7 @@ use constant MODULE_REGEX => qr/ ['"]? ([\w:\.\\]+) /x; -use constant BASE_REGEX => qr/^use base qw\(([^\)]+)/; +use constant BASE_REGEX => qr/^use (?:base|parent) (?:-norequire, )?qw\(([^\)]+)/; # Extract all Perl modules. foreach my $file (@Support::Files::testitems) { @@ -69,7 +62,7 @@ foreach my $module (keys %mods) { } elsif ($line =~ BASE_REGEX or $line =~ MODULE_REGEX) { my $used_string = $1; - # "use base" can have multiple modules + # "use base"/"use parent" can have multiple modules my @used_array = split(/\s+/, $used_string); foreach my $used (@used_array) { next if $used !~ /^Bugzilla/; -- cgit v1.2.3-24-g4f1b