projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.0.20 (RT#13852)
[freeside.git]
/
rt
/
sbin
/
rt-test-dependencies.in
diff --git
a/rt/sbin/rt-test-dependencies.in
b/rt/sbin/rt-test-dependencies.in
index
37ef32f
..
66215ad
100644
(file)
--- a/
rt/sbin/rt-test-dependencies.in
+++ b/
rt/sbin/rt-test-dependencies.in
@@
-3,7
+3,7
@@
#
# COPYRIGHT:
#
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-201
4
Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@
-52,13
+52,19
@@
#
use strict;
#
use strict;
+use warnings;
no warnings qw(numeric redefine);
use Getopt::Long;
no warnings qw(numeric redefine);
use Getopt::Long;
+use Cwd qw(abs_path);
my %args;
my %deps;
my %args;
my %deps;
+my @orig_argv = @ARGV;
+# Save our path because installers or tests can change cwd
+my $script_path = abs_path($0);
+
GetOptions(
\%args, 'v|verbose',
GetOptions(
\%args, 'v|verbose',
- 'install
',
'with-MYSQL',
+ 'install
!',
'with-MYSQL',
'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE',
'with-ORACLE', 'with-FASTCGI',
'with-MODPERL1', 'with-MODPERL2',
'with-POSTGRESQL|with-pg|with-pgsql', 'with-SQLITE',
'with-ORACLE', 'with-FASTCGI',
'with-MODPERL1', 'with-MODPERL2',
@@
-74,6
+80,7
@@
GetOptions(
'with-DASHBOARDS',
'with-USERLOGO',
'with-SSL-MAILGATE',
'with-DASHBOARDS',
'with-USERLOGO',
'with-SSL-MAILGATE',
+ 'with-HTML-DOC',
'download=s',
'repository=s',
'download=s',
'repository=s',
@@
-103,6
+110,7
@@
my %default = (
'with-DASHBOARDS' => 1,
'with-USERLOGO' => 1,
'with-SSL-MAILGATE' => @RT_SSL_MAILGATE@,
'with-DASHBOARDS' => 1,
'with-USERLOGO' => 1,
'with-SSL-MAILGATE' => @RT_SSL_MAILGATE@,
+ 'with-HTML-DOC' => @RT_DEVEL_MODE@,
);
$args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
);
$args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
@@
-290,10
+298,12
@@
Log::Dispatch::Perl
Test::WWW::Mechanize::PSGI
Plack::Middleware::Test::StashWarnings 0.06
Test::LongString
Test::WWW::Mechanize::PSGI
Plack::Middleware::Test::StashWarnings 0.06
Test::LongString
+Test::NoWarnings
+Locale::PO
.
$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
.
$deps{'FASTCGI'} = [ text_to_hash( << '.') ];
-FCGI
+FCGI
0.74
FCGI::ProcManager
.
FCGI::ProcManager
.
@@
-337,14
+347,14
@@
Net::SMTP
.
$deps{'DASHBOARDS'} = [ text_to_hash( << '.') ];
.
$deps{'DASHBOARDS'} = [ text_to_hash( << '.') ];
-HTML::RewriteAttributes 0.0
4
+HTML::RewriteAttributes 0.0
5
MIME::Types
URI 1.59
.
$deps{'GRAPHVIZ'} = [ text_to_hash( << '.') ];
GraphViz
MIME::Types
URI 1.59
.
$deps{'GRAPHVIZ'} = [ text_to_hash( << '.') ];
GraphViz
-IPC::Run
+IPC::Run
0.90
.
$deps{'GD'} = [ text_to_hash( << '.') ];
.
$deps{'GD'} = [ text_to_hash( << '.') ];
@@
-357,8
+367,15
@@
$deps{'USERLOGO'} = [ text_to_hash( << '.') ];
Convert::Color
.
Convert::Color
.
+$deps{'HTML-DOC'} = [ text_to_hash( <<'.') ];
+Pod::Simple 3.24
+HTML::Entities
+.
+
my %AVOID = (
'DBD::Oracle' => [qw(1.23)],
my %AVOID = (
'DBD::Oracle' => [qw(1.23)],
+ 'Email::Address' => [qw(1.893 1.894)],
+ 'Devel::StackTrace' => [qw(1.28 1.29)],
);
if ($args{'download'}) {
);
if ($args{'download'}) {
@@
-403,7
+420,12
@@
foreach my $type (sort grep $args{$_}, keys %args) {
$Missing_By_Type{$type} = \%missing if keys %missing;
}
$Missing_By_Type{$type} = \%missing if keys %missing;
}
-conclude(%Missing_By_Type);
+if ( $args{'install'} && keys %Missing_By_Type ) {
+ exec($script_path, @orig_argv, '--no-install');
+}
+else {
+ conclude(%Missing_By_Type);
+}
sub test_deps {
my @deps = @_;
sub test_deps {
my @deps = @_;