Skip to content

Commit d0f38a3

Browse files
author
Reini Urban
committed
TestBC: test win, fixup TODO handling
start win32 testing, win32 cperl B-C is now much better. do not print TODO twice
1 parent 8027b64 commit d0f38a3

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

t/TestBC.pm

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -906,18 +906,18 @@ sub run_cc_test {
906906
run_cmd($cmdline, 30);
907907
unless (-e $exe) {
908908
if ($ENV{PERL_CORE}) {
909-
if ($^O =~ /^(MSWin32|hpux)/) {
909+
if ($^O =~ /^(hpux)/) {
910910
# mingw with gcc and cygwin should work, but not tested.
911911
ok(1, "skip $^O not yet ready");
912912
return 1;
913913
}
914914
}
915915
if ($todo and $todo =~ /TODO/) {
916-
$todo =~ s/TODO //;
916+
$todo =~ s/TODO //g;
917917
TODO:
918918
{
919919
local $TODO = $todo;
920-
ok(0, "$todo failed $cmdline");
920+
ok(0, "failed $cmdline");
921921
}
922922
} else {
923923
ok(0, "failed $cmdline");
@@ -955,11 +955,11 @@ sub run_cc_test {
955955
}
956956
}
957957
if ($todo and $todo =~ /TODO/) {
958-
$todo =~ s/TODO //;
958+
$todo =~ s/TODO //g;
959959
TODO:
960960
{
961961
local $TODO = $todo;
962-
ok(0, "$todo wanted: \"$expect\", \$\? = $?, got: \"$out\"");
962+
ok(0, "wanted: \"$expect\", \$\? = $?, got: \"$out\"");
963963
}
964964
} else {
965965
ok(0, "wanted: \"$expect\", \$\? = $?, got: \"$out\"");
@@ -1200,11 +1200,11 @@ sub ctest {
12001200
system "$cmd";
12011201
my $exe = $name.$Config{exe_ext};
12021202
unless (-e $exe) {
1203-
if ($ENV{PERL_CORE} and $is_msvc) {
1204-
ok(1, "skip MSVC"); return 1;
1205-
}
1203+
#if ($ENV{PERL_CORE} and $is_msvc) {
1204+
# ok(1, "skip MSVC"); return 1;
1205+
#}
12061206
if ($todo and $todo =~ /TODO/) {
1207-
$todo =~ s/TODO //;
1207+
$todo =~ s/TODO //g;
12081208
TODO: {
12091209
local $TODO = $todo;
12101210
ok(undef, "failed to compile");
@@ -1229,18 +1229,18 @@ sub ctest {
12291229
}
12301230
}
12311231
if ($todo and $todo =~ /TODO/) {
1232-
$todo =~ s/TODO //;
1232+
$todo =~ s/TODO //g;
12331233
TODO: {
12341234
local $TODO = $todo;
1235-
ok ($out =~ /$expected/);
1235+
ok ($ok);
12361236
diag($out) if $ENV{TEST_VERBOSE};
12371237
}
12381238
} else {
1239-
ok ($out =~ /$expected/, $todo);
1239+
ok ($ok, $todo);
12401240
}
12411241
} else {
12421242
if ($todo and $todo =~ /TODO/) {
1243-
$todo =~ s/TODO //;
1243+
$todo =~ s/TODO //g;
12441244
TODO: {
12451245
local $TODO = $todo;
12461246
ok (undef);
@@ -1283,7 +1283,7 @@ sub ccompileok {
12831283
my $ok = -e $name or -e "$name.exe";
12841284
if ($todo and $todo =~ /TODO/) {
12851285
TODO: {
1286-
$todo =~ s/TODO //;
1286+
$todo =~ s/TODO //g;
12871287
local $TODO = $todo;
12881288
ok($ok);
12891289
}

0 commit comments

Comments
 (0)