Merge branch 'master' into em-device-ports-json

2014-08-17 21:01:05 +01:00
parent febcec1865 c5caab6601
commit 60c8d8d7c1
7 changed files with 21 additions and 4 deletions
--- a/Netdisco/t/11-portsort.t
+++ b/Netdisco/t/11-portsort.t
@@ -9,7 +9,7 @@ use FindBin qw( $Bin );
 my @phantomjs = Env::Path->PATH->Whence('phantomjs');
 my $phantomjs = scalar @phantomjs ? $phantomjs[0] : $ENV{ND_PHANTOMJS};

-if ( !-x $phantomjs ) {
+if ( ! defined $phantomjs or !-x $phantomjs ) {
    plan skip_all =>
        "phantomjs not found, please set ND_PHANTOMJS or install phantomjs to the default location";
 }