[Module-build-checkins] Module-Build/t basic.t,1.27.2.4,1.27.2.5 compat.t,1.17.2.2,1.17.2.3 ext.t,1.
Status: Beta
Brought to you by:
kwilliams
From: Randy W. S. <si...@us...> - 2005-01-07 02:17:57
|
Update of /cvsroot/module-build/Module-Build/t In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27044/t Modified Files: Tag: release-0_26_branch basic.t compat.t ext.t install.t runthrough.t signature.t xs.t Log Message: Add workaround for test files because Devel::Cover causes require to fail when the argument to require is an expression involving File::Spec. We now assign the result of the File::Spec call to a variable and then call require with that variable. Index: signature.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/signature.t,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** signature.t 2 Sep 2003 16:33:04 -0000 1.7 --- signature.t 7 Jan 2005 02:17:42 -0000 1.7.2.1 *************** *** 3,7 **** use Test; use File::Spec; ! require File::Spec->catfile('t', 'common.pl'); use Module::Build; --- 3,9 ---- use Test; use File::Spec; ! ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; use Module::Build; Index: runthrough.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/runthrough.t,v retrieving revision 1.45.2.3 retrieving revision 1.45.2.4 diff -C2 -d -r1.45.2.3 -r1.45.2.4 *** runthrough.t 30 Nov 2004 13:12:16 -0000 1.45.2.3 --- runthrough.t 7 Jan 2005 02:17:42 -0000 1.45.2.4 *************** *** 11,16 **** ok $INC{'Module/Build.pm'}, '/blib/', "Make sure version from blib/ is loaded"; ! ! require File::Spec->catfile('t', 'common.pl'); ######################### End of black magic. --- 11,16 ---- ok $INC{'Module/Build.pm'}, '/blib/', "Make sure version from blib/ is loaded"; ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; ######################### End of black magic. Index: ext.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/ext.t,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** ext.t 13 Dec 2004 04:16:40 -0000 1.1.2.5 --- ext.t 7 Jan 2005 02:17:42 -0000 1.1.2.6 *************** *** 4,8 **** use File::Spec; ! require File::Spec->catfile('t', 'common.pl'); my @unix_splits = --- 4,9 ---- use File::Spec; ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; my @unix_splits = Index: compat.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/compat.t,v retrieving revision 1.17.2.2 retrieving revision 1.17.2.3 diff -C2 -d -r1.17.2.2 -r1.17.2.3 *** compat.t 6 Jan 2005 04:08:44 -0000 1.17.2.2 --- compat.t 7 Jan 2005 02:17:41 -0000 1.17.2.3 *************** *** 6,10 **** use File::Path; use Config; ! require File::Spec->catfile('t', 'common.pl'); use Carp; $SIG{__WARN__} = \&Carp::cluck; --- 6,12 ---- use File::Path; use Config; ! ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; use Carp; $SIG{__WARN__} = \&Carp::cluck; Index: install.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/install.t,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** install.t 4 Oct 2004 22:13:48 -0000 1.12 --- install.t 7 Jan 2005 02:17:42 -0000 1.12.2.1 *************** *** 2,6 **** use Test; ! BEGIN { plan tests => 29 } use Module::Build; use File::Spec; --- 2,6 ---- use Test; ! BEGIN { plan tests => 28 } use Module::Build; use File::Spec; *************** *** 8,13 **** use Config; ! ok(1); ! require File::Spec->catfile('t', 'common.pl'); my $start_dir = Module::Build->cwd; --- 8,13 ---- use Config; ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; my $start_dir = Module::Build->cwd; Index: basic.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/basic.t,v retrieving revision 1.27.2.4 retrieving revision 1.27.2.5 diff -C2 -d -r1.27.2.4 -r1.27.2.5 *** basic.t 15 Nov 2004 19:51:10 -0000 1.27.2.4 --- basic.t 7 Jan 2005 02:17:41 -0000 1.27.2.5 *************** *** 9,13 **** use File::Spec; use Cwd; ! require File::Spec->catfile('t', 'common.pl'); ######################### End of black magic. --- 9,15 ---- use File::Spec; use Cwd; ! ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; ######################### End of black magic. Index: xs.t =================================================================== RCS file: /cvsroot/module-build/Module-Build/t/xs.t,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** xs.t 21 May 2004 03:14:20 -0000 1.14 --- xs.t 7 Jan 2005 02:17:42 -0000 1.14.2.1 *************** *** 10,14 **** plan tests => 12; ! require File::Spec->catfile('t', 'common.pl'); ######################### End of black magic. --- 10,15 ---- plan tests => 12; ! my $common_pl = File::Spec->catfile('t', 'common.pl'); ! require $common_pl; ######################### End of black magic. |