-#!./perl
+#!/usr/bin/perl
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
+ if( $ENV{PERL_CORE} ) {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+ }
}
+chdir 't';
+
use Config;
use ExtUtils::Embed;
use File::Spec;
print "1..9\n";
my $cc = $Config{'cc'};
my $cl = ($^O eq 'MSWin32' && $cc eq 'cl');
-my $exe = 'embed_test' . $Config{'exe_ext'};
+my $borl = ($^O eq 'MSWin32' && $cc eq 'bcc32');
+my $skip_exe = $^O eq 'os2' && $Config{ldflags} =~ /(?<!\S)-Zexe\b/;
+my $exe = 'embed_test';
+$exe .= $Config{'exe_ext'} unless $skip_exe; # Linker will auto-append it
my $obj = 'embed_test' . $Config{'obj_ext'};
my $inc = File::Spec->updir;
my $lib = File::Spec->updir;
if ($cl) {
push(@cmd,$cc,"-Fe$exe");
}
+ elsif ($borl) {
+ push(@cmd,$cc,"-o$exe");
+ }
else {
push(@cmd,$cc,'-o' => $exe);
}
$inc = File::Spec->catdir($inc,'include');
push(@cmd,"-I$inc");
if ($cc eq 'cl') {
- push(@cmd,'-link',"-libpath:$lib",$Config{'libperl'},$Config{'libc'});
+ push(@cmd,'-link',"-libpath:$lib",$Config{'libperl'},$Config{'libs'});
}
else {
push(@cmd,"-L$lib",File::Spec->catfile($lib,$Config{'libperl'}),$Config{'libc'});
}
}
- else {
+ else { # Not MSWin32.
push(@cmd,"-L$lib",'-lperl');
- }
- {
local $SIG{__WARN__} = sub {
- warn $_[0] unless $_[0] =~ /No library found for -lperl/
+ warn $_[0] unless $_[0] =~ /No library found for .*perl/
};
+ push(@cmd, '-Zlinker', '/PM:VIO') # Otherwise puts a warning to STDOUT!
+ if $^O eq 'os2' and $Config{ldflags} =~ /(?<!\S)-Zomf\b/;
push(@cmd,ldopts());
}
+ if ($borl) {
+ @cmd = ($cmd[0],(grep{/^-[LI]/}@cmd[1..$#cmd]),(grep{!/^-[LI]/}@cmd[1..$#cmd]));
+ }
if ($^O eq 'aix') { # AIX needs an explicit symbol export list.
my ($perl_exp) = grep { -f } qw(perl.exp ../perl.exp);
s!-bE:(\S+)!-bE:$perl_exp!;
}
}
- elsif ($^O eq 'cygwin') { # Cygwin needs the libperl copied
+ elsif ($^O eq 'cygwin') { # Cygwin needs the shared libperl copied
my $v_e_r_s = $Config{version};
$v_e_r_s =~ tr/./_/;
- system("cp ../libperl$v_e_r_s.dll ./"); # for test 1
- system("cp ../$Config{'libperl'} ../libperl.a"); # for test 1
+ system("cp ../cygperl$v_e_r_s.dll ./"); # for test 1
}
elsif ($Config{'libperl'} !~ /\Alibperl\./) {
# Everyone needs libperl copied if it's not found by '-lperl'.
$testlib = $Config{'libperl'};
my $srclib = $testlib;
- $testlib =~ s/^[^.]+/libperl/;
+ $testlib =~ s/.+(?=\.[^.]*)/libperl/;
$testlib = File::Spec::->catfile($lib, $testlib);
$srclib = File::Spec::->catfile($lib, $srclib);
if (-f $srclib) {
unlink $testlib if -f $testlib;
- my $lncmd = "$Config{'ln'} $srclib $testlib";
+ my $ln_or_cp = $Config{'ln'} || $Config{'cp'};
+ my $lncmd = "$ln_or_cp $srclib $testlib";
#print "# $lncmd\n";
$libperl_copied = 1 unless system($lncmd);
}
}
}
my $status;
-my $display_cmd = "@cmd";
-chomp($display_cmd); # where is the newline coming from? ldopts()?
-print "# $display_cmd\n";
-$status = system(join(' ',@cmd));
+# On OS/2 the linker will always emit an empty line to STDOUT; filter these
+my $cmd = join ' ', @cmd;
+chomp($cmd); # where is the newline coming from? ldopts()?
+print "# $cmd\n";
+my @out = `$cmd`;
+$status = $?;
+print "# $_\n" foreach @out;
+
if ($^O eq 'VMS' && !$status) {
print "# @cmd2\n";
$status = system(join(' ',@cmd2));
$embed_test = "run/nodebug $exe" if $^O eq 'VMS';
print "# embed_test = $embed_test\n";
$status = system($embed_test);
-print (($status? 'not ':'')."ok 9 # $status\n");
+print (($status? 'not ':'')."ok 9 # system returned $status\n");
unlink($exe,"embed_test.c",$obj);
+unlink("$exe$Config{exe_ext}") if $skip_exe;
unlink("embed_test.map","embed_test.lis") if $^O eq 'VMS';
-unlink(glob("./libperl*.dll")) if $^O eq 'cygwin';
-unlink("../libperl.a") if $^O eq 'cygwin';
+unlink(glob("./*.dll")) if $^O eq 'cygwin';
unlink($testlib) if $libperl_copied;
# gcc -g -I.. -L../ -o perl_test perl_test.c -lperl `../perl -I../lib -MExtUtils::Embed -I../ -e ccopts -e ldopts`
#define my_puts(a) if(puts(a) < 0) exit(666)
-char *cmds[] = { "perl","-e", "print qq[ok 5\\n]", NULL };
+static char *cmds[] = { "perl","-e", "$|=1; print qq[ok 5\\n]", NULL };
+
+#ifdef PERL_GLOBAL_STRUCT_PRIVATE
+static struct perl_vars *my_plvarsp;
+struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; }
+#endif
int main(int argc, char **argv, char **env)
{
- PerlInterpreter *my_perl = perl_alloc();
+ PerlInterpreter *my_perl;
+#ifdef PERL_GLOBAL_STRUCT
+ dVAR;
+ struct perl_vars *plvarsp = init_global_struct();
+# ifdef PERL_GLOBAL_STRUCT_PRIVATE
+ my_vars = my_plvarsp = plvarsp;
+# endif
+#endif /* PERL_GLOBAL_STRUCT */
+
+ (void)argc; /* PERL_SYS_INIT3 may #define away their use */
+ (void)argv;
+ PERL_SYS_INIT3(&argc,&argv,&env);
+
+ my_perl = perl_alloc();
my_puts("ok 2");
perl_free(my_perl);
+#ifdef PERL_GLOBAL_STRUCT
+ free_global_struct(plvarsp);
+#endif /* PERL_GLOBAL_STRUCT */
+
my_puts("ok 8");
+ PERL_SYS_TERM();
+
return 0;
}
-
-
-
-