diff options
| author | Craig A. Berry <craigberry@mac.com> | 2011-07-14 17:20:41 -0500 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2011-07-14 17:20:41 -0500 |
| commit | fe3772c388e259ff8210505dc7e865853c277e69 (patch) | |
| tree | a6e526b9f4de594d120bd22beb28ba2dbedaabdf | |
| parent | 92c695dbe5618ad42efef9ebae10c088e2e98e62 (diff) | |
| download | perl-fe3772c388e259ff8210505dc7e865853c277e69.tar.gz | |
A typemap is a file, not a directory.
| -rw-r--r-- | dist/ExtUtils-ParseXS/t/512-t-file.t | 2 | ||||
| -rw-r--r-- | dist/ExtUtils-ParseXS/t/600-t-compat.t | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dist/ExtUtils-ParseXS/t/512-t-file.t b/dist/ExtUtils-ParseXS/t/512-t-file.t index 3bf1addf26..53bb393738 100644 --- a/dist/ExtUtils-ParseXS/t/512-t-file.t +++ b/dist/ExtUtils-ParseXS/t/512-t-file.t @@ -31,7 +31,7 @@ $map->add_outputmap(xstype => 'T_IV', code => 'sv_setiv($arg, (IV)$var);'); is($map->as_string(), $cmp_typemap_str, "Simple typemap matches reference file"); my $tmpdir = File::Temp::tempdir(CLEANUP => 1, TMPDIR => 1); -my $tmpfile = File::Spec->catdir($tmpdir, 'simple.typemap'); +my $tmpfile = File::Spec->catfile($tmpdir, 'simple.typemap'); $map->write(file => $tmpfile); is($map->as_string(), slurp($tmpfile), "Simple typemap write matches as_string"); diff --git a/dist/ExtUtils-ParseXS/t/600-t-compat.t b/dist/ExtUtils-ParseXS/t/600-t-compat.t index abb99f8fd9..1f22e40e03 100644 --- a/dist/ExtUtils-ParseXS/t/600-t-compat.t +++ b/dist/ExtUtils-ParseXS/t/600-t-compat.t @@ -24,36 +24,36 @@ my @tests = ( { name => 'Simple conflict', local_maps => [ - File::Spec->catdir($path_prefix, "conflicting.typemap"), + File::Spec->catfile($path_prefix, "conflicting.typemap"), ], std_maps => [ - File::Spec->catdir($path_prefix, "other.typemap"), + File::Spec->catfile($path_prefix, "other.typemap"), ], }, { name => 'B', local_maps => [ - File::Spec->catdir($path_prefix, "b.typemap"), + File::Spec->catfile($path_prefix, "b.typemap"), ], std_maps => [], }, { name => 'B and perl', local_maps => [ - File::Spec->catdir($path_prefix, "b.typemap"), + File::Spec->catfile($path_prefix, "b.typemap"), ], std_maps => [ - File::Spec->catdir($path_prefix, "perl.typemap"), + File::Spec->catfile($path_prefix, "perl.typemap"), ], }, { name => 'B and perl and B again', local_maps => [ - File::Spec->catdir($path_prefix, "b.typemap"), + File::Spec->catfile($path_prefix, "b.typemap"), ], std_maps => [ - File::Spec->catdir($path_prefix, "perl.typemap"), - File::Spec->catdir($path_prefix, "b.typemap"), + File::Spec->catfile($path_prefix, "perl.typemap"), + File::Spec->catfile($path_prefix, "b.typemap"), ], }, ); |