7 files changed, 44 insertions, 7 deletions
diff --git a/t/pm/Channels.pl b/t/pm/Channels.pl
index a929750ff..b7d0b0a19 100644
--- a/t/pm/Channels.pl
+++ b/t/pm/Channels.pl
@@ -18,4 +18,9 @@
 use Automake::Channels;
 use Automake::Location;
 
-msg ('test-fatal', new Automake::Location ('.'), "Test Message");
+eval { msg ('test-fatal', new Automake::Location ('.'), "Test Message") };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/Cond2.pl b/t/pm/Cond2.pl
index f586a67b9..882daa99f 100644
--- a/t/pm/Cond2.pl
+++ b/t/pm/Cond2.pl
@@ -19,4 +19,9 @@
 use Automake::Condition;
 
 my $cond = new Automake::Condition ('TRUE');
-new Automake::Condition ($cond);
+eval { new Automake::Condition ($cond) };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/Cond3.pl b/t/pm/Cond3.pl
index 769d01b9a..0294d74b6 100644
--- a/t/pm/Cond3.pl
+++ b/t/pm/Cond3.pl
@@ -19,4 +19,9 @@
 use Automake::Condition;
 
 my $cond = new Automake::Condition ("COND1_TRUE");
-new Automake::Condition ("$cond");
+eval { new Automake::Condition ("$cond") };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/DisjCon2.pl b/t/pm/DisjCon2.pl
index e5f204db6..2bfd51ab0 100644
--- a/t/pm/DisjCon2.pl
+++ b/t/pm/DisjCon2.pl
@@ -21,4 +21,10 @@ use Automake::DisjConditions;
 
 my $cond = new Automake::Condition ('TRUE');
 my $cond2 = new Automake::DisjConditions ($cond);
-new Automake::DisjConditions ($cond2);
+
+eval { new Automake::DisjConditions ($cond2) };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/DisjCon3.pl b/t/pm/DisjCon3.pl
index cc1f467fd..6ccd734f7 100644
--- a/t/pm/DisjCon3.pl
+++ b/t/pm/DisjCon3.pl
@@ -20,4 +20,10 @@ use Automake::Condition qw/TRUE FALSE/;
 use Automake::DisjConditions;
 
 my $cond = new Automake::Condition ("COND1_TRUE");
-new Automake::DisjConditions ("$cond");
+
+eval { new Automake::DisjConditions ("$cond") };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/Version2.pl b/t/pm/Version2.pl
index d6d0111dd..808e6cfd0 100644
--- a/t/pm/Version2.pl
+++ b/t/pm/Version2.pl
@@ -17,4 +17,9 @@
 
 use Automake::Version;
 
-Automake::Version::check ('', '1.2.3');
+eval { Automake::Version::check ('', '1.2.3') };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;
diff --git a/t/pm/Version3.pl b/t/pm/Version3.pl
index f1583c081..ded43c26b 100644
--- a/t/pm/Version3.pl
+++ b/t/pm/Version3.pl
@@ -17,4 +17,9 @@
 
 use Automake::Version;
 
-Automake::Version::check ('1.2.3', '');
+eval { Automake::Version::check ('1.2.3', '') };
+
+warn $@ if $@;
+
+exit 0 if $@;
+exit 1;