Changeset 2275 in ProjectBuilder

Timestamp:

Aug 30, 2017, 5:07:58 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix tests so that they really work when Test::More isn't found

Location:

devel

Files:

• pb-modules/t/Base.t (modified) (2 diffs)
• pb-modules/t/Conf.t (modified) (2 diffs)
• pb-modules/t/Log.t (modified) (2 diffs)
• pb/t/pb.t (modified) (2 diffs)

devel/pb-modules/t/Base.t

@@ -6 +6 @@
 use ProjectBuilder::Base;
 
+my $res;
 eval
 {
     require Test::More;
     Test::More->import();
+    $res = $@;
     my ($tmv,$tmsv) = split(/\./,$Test::More::VERSION);
     if ($tmsv lt 87) {
@@ -17 +19 @@
 
 # Test::More appropriate version not found so no test will be performed here
-if ($@) {
+if ($res) {
     require Test;
     Test->import();

devel/pb-modules/t/Conf.t

@@ -4 +4 @@
 
 use strict;
+use ProjectBuilder::Version;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
 use ProjectBuilder::Distribution;
 
+my $res;
 eval
 {
     require Test::More;
     Test::More->import();
+    $res = $@;
     my ($tmv,$tmsv) = split(/\./,$Test::More::VERSION);
     if ($tmsv lt 87) {
@@ -19 +22 @@
 
 # Test::More appropriate version not found so no test will be performed here
-if ($@) {
+if ($res) {
     require Test;
     Test->import();

devel/pb-modules/t/Log.t

@@ -6 +6 @@
 use ProjectBuilder::Base;
 
+my $res;
 eval
 {
     require Test::More;
     Test::More->import();
+    $res = $@;
     my ($tmv,$tmsv) = split(/\./,$Test::More::VERSION);
     if ($tmsv lt 87) {
@@ -17 +19 @@
 
 # Test::More not found so no test will be performed here
-if ($@) {
+if ($res) {
     require Test;
     Test->import();

devel/pb/t/pb.t

@@ -6 +6 @@
 use ProjectBuilder::Filter;
 
+my $res;
 eval
 {
     require Test::More;
     Test::More->import();
+    $res = $@;
     my ($tmv,$tmsv) = split(/\./,$Test::More::VERSION);
     if ($tmsv lt 87) {
@@ -17 +19 @@
 
 # Test::More appropriate version not found so no test will be performed here
-if ($@) {
+if ($res) {
     require Test;
     Test->import();