[poe-commits] poe/mylib testreport.pl,1.13,1.14
Brought to you by:
rcaputo
From: <rc...@us...> - 2004-06-03 22:03:25
|
Update of /cvsroot/poe/poe/mylib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23047/mylib Modified Files: testreport.pl Log Message: POE.pm was moved during a recent directory restructuring. The test report generator did not know where to find it, so it silently reported an empty-versioned POE. This change moves the POE module load before tests, and makes it a fatal error if POE can't be loaded. It also includes the new library directory, so POE can be loaded. This should resolve RT ticket 6143. Index: testreport.pl =================================================================== RCS file: /cvsroot/poe/poe/mylib/testreport.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** testreport.pl 24 May 2004 21:50:25 -0000 1.13 --- testreport.pl 3 Jun 2004 22:03:15 -0000 1.14 *************** *** 22,26 **** package My::Strap; ! use lib qw(../mylib ../ ./mylib ./); use Test::Harness; use base qw(Test::Harness::Straps); --- 22,26 ---- package My::Strap; ! use lib qw(../mylib ../ ./mylib ./ ../lib ./lib); use Test::Harness; use base qw(Test::Harness::Straps); *************** *** 112,115 **** --- 112,121 ---- close MAKEFILE; + # Require POE early, so we don't bother with the tests if something + # catastrophic has occurred (like POE's library directory moves + # outside C<use lib> or something). The version number is still + # dumped into the XML file at the appropriate time. + require POE; + my %test_results; my $width = Test::Harness::_leader_width(@test_files); *************** *** 177,187 **** $xml .= "\t\t<perl version=\"$]\" />\n"; ! eval "require POE;"; ! if($@) { ! $xml .= "\t\t<poe />\n"; ! } else { ! $xml .= "\t\t<poe version=\"$POE::VERSION\" />\n"; ! } ! eval "use Gtk;"; if($@) { --- 183,190 ---- $xml .= "\t\t<perl version=\"$]\" />\n"; ! # Dump POE's version. POE has been required earlier, without an ! # eval() wrapper, so the version must be available by this time. ! $xml .= "\t\t<poe version=\"$POE::VERSION\" />\n"; ! eval "use Gtk;"; if($@) { |