Author: jkeenan
Date: Tue Jan 8 18:57:14 2008
New Revision: 24693
Modified:
trunk/t/configure/143-auto_gmp-02.t
trunk/t/configure/144-auto_readline-01.t
trunk/t/configure/145-auto_gdbm-02.t
Log:
Per consultation with particle: Using File::Spec->catpath() and catdir() to
create paths. Marking one regex with \Q and \E to avoid escaping problems on
Win32.
Modified: trunk/t/configure/143-auto_gmp-02.t
==============================================================================
--- trunk/t/configure/143-auto_gmp-02.t (original)
+++ trunk/t/configure/143-auto_gmp-02.t Tue Jan 8 18:57:14 2008
@@ -8,6 +8,7 @@
use Test::More tests => 31;
use Carp;
use Cwd;
+use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -78,8 +79,10 @@
ok(chdir $tdir, "Able to change to temporary directory");
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
- $conf->data->set('fink_lib_dir' => qq{$tdir/lib});
- $conf->data->set('fink_include_dir' => qq{$tdir/include});
+ my $libdir = File::Spec->catdir( $tdir, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir, 'include' );
+ $conf->data->set('fink_lib_dir' => $libdir);
+ $conf->data->set('fink_include_dir' => $includedir);
$osname = 'darwin';
$flagsbefore = $conf->data->get( 'linkflags' );
ok($step->_handle_darwin_for_fink($conf, $osname, 'gmp.h'),
@@ -95,11 +98,11 @@
ok(chdir $tdir2, "Able to change to temporary directory");
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = qq{$tdir2/lib};
- my $includedir = qq{$tdir2/include};
+ my $libdir = File::Spec->catdir( $tdir2, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir2, 'include' );
$conf->data->set('fink_lib_dir' => $libdir);
$conf->data->set('fink_include_dir' => $includedir);
- my $foo = qq{$includedir/gmp.h};
+ my $foo = File::Spec->catfile( $includedir, 'gmp.h' );
open my $FH, ">", $foo or croak "Could not open for writing";
print $FH "Hello world\n";
close $FH or croak "Could not close after writing";
@@ -110,7 +113,7 @@
"handle_darwin_for_fink() returned true value");
$flagsafter = $conf->data->get( 'linkflags' );
isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L$libdir/,
+ like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
"'linkflags' modified as expected");
ok(chdir $cwd, "Able to change back to original directory after testing");
Modified: trunk/t/configure/144-auto_readline-01.t
==============================================================================
--- trunk/t/configure/144-auto_readline-01.t (original)
+++ trunk/t/configure/144-auto_readline-01.t Tue Jan 8 18:57:14 2008
@@ -8,6 +8,7 @@
use Test::More tests => 35;
use Carp;
use Cwd;
+use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib );
use_ok('config::init::defaults');
@@ -16,14 +17,6 @@
use Parrot::Configure::Options qw( process_options );
use Parrot::Configure::Test qw( test_step_thru_runstep);
-=for hints_for_testing The documentation for this package is skimpy;
-please try to improve it, e.g., by providing a short description of what
-the 'readline' function is. Some branches are compiler- or OS-specific.
-As noted in a comment in the module, please consider the issues raised
-in http://rt.perl.org/rt3/Ticket/Display.html?id=43134.
-
-=cut
-
my $args = process_options(
{
argv => [ ],
@@ -87,8 +80,10 @@
ok(chdir $tdir, "Able to change to temporary directory");
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
- $conf->data->set('fink_lib_dir' => qq{$tdir/lib});
- $conf->data->set('fink_include_dir' => qq{$tdir/include});
+ my $libdir = File::Spec->catdir( $tdir, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir, 'include' );
+ $conf->data->set('fink_lib_dir' => $libdir);
+ $conf->data->set('fink_include_dir' => $includedir);
$osname = 'darwin';
$flagsbefore = $conf->data->get( 'linkflags' );
ok($step->_handle_darwin_for_fink($conf, $osname, 'readline/readline.h'),
@@ -105,11 +100,11 @@
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
ok( (mkdir 'include/readline'), "Able to make include/readline directory");
- my $libdir = qq{$tdir2/lib};
- my $includedir = qq{$tdir2/include};
+ my $libdir = File::Spec->catdir( $tdir2, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir2, 'include' );
$conf->data->set('fink_lib_dir' => $libdir);
$conf->data->set('fink_include_dir' => $includedir);
- my $foo = qq{$includedir/readline/readline.h};
+ my $foo = File::Spec->catfile( $includedir, 'readline', 'readline.h' );
open my $FH, ">", $foo or croak "Could not open for writing";
print $FH "Hello world\n";
close $FH or croak "Could not close after writing";
@@ -120,7 +115,7 @@
"handle_darwin_for_fink() returned true value");
$flagsafter = $conf->data->get( 'linkflags' );
isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L$libdir/,
+ like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
"'linkflags' modified as expected");
ok(chdir $cwd, "Able to change back to original directory after testing");
Modified: trunk/t/configure/145-auto_gdbm-02.t
==============================================================================
--- trunk/t/configure/145-auto_gdbm-02.t (original)
+++ trunk/t/configure/145-auto_gdbm-02.t Tue Jan 8 18:57:14 2008
@@ -8,6 +8,7 @@
use Test::More tests => 25;
use Carp;
use Cwd;
+use File::Spec;
use File::Temp qw( tempdir );
use lib qw( lib t/configure/testlib );
use_ok('config::init::defaults');
@@ -57,8 +58,10 @@
ok(chdir $tdir, "Able to change to temporary directory");
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
- $conf->data->set('fink_lib_dir' => qq{$tdir/lib});
- $conf->data->set('fink_include_dir' => qq{$tdir/include});
+ my $libdir = File::Spec->catdir( $tdir, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir, 'include' );
+ $conf->data->set('fink_lib_dir' => $libdir);
+ $conf->data->set('fink_include_dir' => $includedir);
$osname = 'darwin';
$flagsbefore = $conf->data->get( 'linkflags' );
ok($step->_handle_darwin_for_fink($conf, $osname, 'gdbm.h'),
@@ -74,11 +77,11 @@
ok(chdir $tdir2, "Able to change to temporary directory");
ok( (mkdir 'lib'), "Able to make lib directory");
ok( (mkdir 'include'), "Able to make include directory");
- my $libdir = qq{$tdir2/lib};
- my $includedir = qq{$tdir2/include};
+ my $libdir = File::Spec->catdir( $tdir2, 'lib' );
+ my $includedir = File::Spec->catdir( $tdir2, 'include' );
$conf->data->set('fink_lib_dir' => $libdir);
$conf->data->set('fink_include_dir' => $includedir);
- my $foo = qq{$includedir/gdbm.h};
+ my $foo = File::Spec->catfile( $includedir, 'gdbm.h' );
open my $FH, ">", $foo or croak "Could not open for writing";
print $FH "Hello world\n";
close $FH or croak "Could not close after writing";
@@ -89,7 +92,7 @@
"handle_darwin_for_fink() returned true value");
$flagsafter = $conf->data->get( 'linkflags' );
isnt($flagsbefore, $flagsafter, "Change in linkflags, as expected");
- like($conf->data->get( 'linkflags' ), qr/-L$libdir/,
+ like($conf->data->get( 'linkflags' ), qr/-L\Q$libdir\E/,
"'linkflags' modified as expected");
ok(chdir $cwd, "Able to change back to original directory after testing");
