diff --git t/src/atomic.t t/src/atomic.t index b34a0d9..cf4381d 100644 --- t/src/atomic.t +++ t/src/atomic.t @@ -27,7 +27,9 @@ Tests atomic operation support. # generic tests -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 4; diff --git t/src/basic.t t/src/basic.t index e90cd7f..21a972b 100644 --- t/src/basic.t +++ t/src/basic.t @@ -6,9 +6,12 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 2; diff --git t/src/embed.t t/src/embed.t index f6437f6..4248b49 100644 --- t/src/embed.t +++ t/src/embed.t @@ -9,7 +9,9 @@ use Parrot::Test; use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 16; diff --git t/src/embed/api.t t/src/embed/api.t index caaa397..abea3a2 100644 --- t/src/embed/api.t +++ t/src/embed/api.t @@ -6,10 +6,13 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; use Parrot::Test::Util 'create_tempfile'; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 8; diff --git t/src/exit.t t/src/exit.t index 2113399..d3dc0c4 100644 --- t/src/exit.t +++ t/src/exit.t @@ -6,9 +6,12 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 1; diff --git t/src/extend.t t/src/extend.t index 48b8467..e7faa4c 100644 --- t/src/extend.t +++ t/src/extend.t @@ -12,7 +12,9 @@ use Parrot::Test; use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 24; diff --git t/src/extend_vtable.t t/src/extend_vtable.t index 7142347..5d3f9e0 100644 --- t/src/extend_vtable.t +++ t/src/extend_vtable.t @@ -6,9 +6,13 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); + plan tests => 139; diff --git t/src/misc.t t/src/misc.t index 583ea04..34b92f9 100644 --- t/src/misc.t +++ t/src/misc.t @@ -6,9 +6,12 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 4; diff --git t/src/pointer_array.t t/src/pointer_array.t index 72395b8..0441ef2 100644 --- t/src/pointer_array.t +++ t/src/pointer_array.t @@ -11,7 +11,9 @@ use Parrot::Test; use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); =head1 NAME diff --git t/src/warnings.t t/src/warnings.t index 28f797c..dfc4e56 100644 --- t/src/warnings.t +++ t/src/warnings.t @@ -6,9 +6,12 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; use Parrot::Test; +use Parrot::Config; use File::Spec::Functions; -plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile(qw/src parrot_config.o/); +my $parrot_config = "parrot_config" . $PConfig{o}; + +plan skip_all => 'src/parrot_config.o does not exist' unless -e catfile("src", $parrot_config); plan tests => 2;