diff --git a/test_output/cover/cond_or.5.012000 b/test_output/cover/cond_or.5.012000 index 239c0403..2355a310 100644 --- a/test_output/cover/cond_or.5.012000 +++ b/test_output/cover/cond_or.5.012000 @@ -4,9 +4,9 @@ Reading database from ... ---------------- ------ ------ ------ ------ ------ File stmt bran cond sub total ---------------- ------ ------ ------ ------ ------ -tests/cond_or 89.6 35.0 64.4 60.0 70.4 +tests/cond_or 89.4 33.3 64.4 60.0 70.5 tests/cond_or.pl 100.0 n/a 57.5 100.0 75.7 -Total 92.9 35.0 61.6 75.0 72.1 +Total 92.8 33.3 61.6 75.0 72.2 ---------------- ------ ------ ------ ------ ------ @@ -28,8 +28,8 @@ line err stmt bran cond sub code 7 # The latest version of this software should be available from my homepage: 8 # http://www.pjcj.net 9 -10 # __COVER__ skip_test $] < 5.008 || $^O eq "cygwin" -11 # __COVER__ skip_reason Busted on 5.6 and cygwin +10 # __COVER__ skip_test $^O eq "cygwin" +11 # __COVER__ skip_reason Busted on cygwin 12 13 1 1 use strict; 1 @@ -44,75 +44,73 @@ line err stmt bran cond sub code 19 1 my $z = 0; 20 1 $::foo = 17; 21 -22 *** 1 * 50 if ($] >= 5.009) { -23 1 $ENV{PATH} = "/bin"; -24 1 system "pwd"; -25 1 1 use lib "tests"; +22 1 $ENV{PATH} = "/bin"; +23 1 system "pwd"; +24 1 1 use lib "tests"; 1 1 -26 1 my $file = "cond_or.pl"; -27 *** 1 * 50 unless (my $return = do $file) { -28 *** *0 * 0 die "couldn't parse $file: $@" if $@; -29 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; -30 *** *0 * 0 die "couldn't run $file" unless $return; -31 } -32 } -33 -34 1 for my $i (0 .. 10) { -35 *** 11 * 50 $y || -36 $x[1]++; -37 -38 *** 11 * 50 * 33 $y || -39 $x[0]++ || -40 $x[1]++; -41 -42 *** 11 * 50 $x[2]++ -43 unless $z; -44 -45 11 for (0 .. 2) { -46 33 $x[3]++; -47 } -48 -49 *** 11 * 50 if ($z) { -50 *** *0 $x[4]++; -51 } else { -52 11 $x[5]++; -53 } -54 -55 *** 11 * 33 my $p = $y || $z; -56 *** 11 * 33 my $q = $z || $y; -57 11 100 my $r = $i || "qqq"; -58 11 100 my $s = $i || []; -59 11 my $t = $y | $z; -60 *** 11 * 50 my $u = $y || 0; -61 *** 11 * 50 my $v = $y || undef; -62 *** 11 * 50 my $w = $z || 0; -63 -64 *** 11 * 33 $p ||= $y; -65 *** 11 * 33 $p ||= $z; -66 *** 11 * 66 $x[ 6] ||= $y; -67 *** 11 * 33 $x[ 7] ||= $z; -68 11 100 $x[ 8] ||= 1; -69 11 100 $x[ 9] ||= {}; -70 11 100 $x[10] ||= \"foo"; -71 11 100 $x[11] ||= \$y; -72 11 100 $x[12] ||= \*STDIO; -73 *** 11 100 *0 $x[13] ||= sub { 1 }; +25 1 my $file = "cond_or.pl"; +26 *** 1 * 50 unless (my $return = do $file) { +27 *** *0 * 0 die "couldn't parse $file: $@" if $@; +28 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; +29 *** *0 * 0 die "couldn't run $file" unless $return; +30 } +31 +32 1 for my $i (0 .. 10) { +33 *** 11 * 50 $y || +34 $x[1]++; +35 +36 *** 11 * 50 * 33 $y || +37 $x[0]++ || +38 $x[1]++; +39 +40 *** 11 * 50 $x[2]++ +41 unless $z; +42 +43 11 for (0 .. 2) { +44 33 $x[3]++; +45 } +46 +47 *** 11 * 50 if ($z) { +48 *** *0 $x[4]++; +49 } else { +50 11 $x[5]++; +51 } +52 +53 *** 11 * 33 my $p = $y || $z; +54 *** 11 * 33 my $q = $z || $y; +55 11 100 my $r = $i || "qqq"; +56 11 100 my $s = $i || []; +57 11 my $t = $y | $z; +58 *** 11 * 50 my $u = $y || 0; +59 *** 11 * 50 my $v = $y || undef; +60 *** 11 * 50 my $w = $z || 0; +61 +62 *** 11 * 33 $p ||= $y; +63 *** 11 * 33 $p ||= $z; +64 *** 11 * 66 $x[ 6] ||= $y; +65 *** 11 * 33 $x[ 7] ||= $z; +66 11 100 $x[ 8] ||= 1; +67 11 100 $x[ 9] ||= {}; +68 11 100 $x[10] ||= \"foo"; +69 11 100 $x[11] ||= \$y; +70 11 100 $x[12] ||= \*STDIO; +71 *** 11 100 *0 $x[13] ||= sub { 1 }; *** *0 -74 11 100 $x[14] ||= *::foo{SCALAR}; -75 *** 11 * 50 $x[15] ||= *STDIO{IO}; -76 11 100 $x[16] ||= bless {}, "XXX"; -77 11 100 $x[17] ||= $i == 1; -78 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; -79 11 100 $x[18] ||= <<"EOD"; -80 blah -81 EOD -82 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; -83 *** 11 * 0 *0 sub { $x[19] ||= 1 }; +72 11 100 $x[14] ||= *::foo{SCALAR}; +73 *** 11 * 50 $x[15] ||= *STDIO{IO}; +74 11 100 $x[16] ||= bless {}, "XXX"; +75 11 100 $x[17] ||= $i == 1; +76 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; +77 11 100 $x[18] ||= <<"EOD"; +78 blah +79 EOD +80 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; +81 *** 11 * 0 *0 sub { $x[19] ||= 1 }; *** *0 -84 } -85 -86 # print join(", ", @x), "\n"; +82 } +83 +84 # print join(", ", @x), "\n"; Branches @@ -120,16 +118,15 @@ Branches line err % true false branch ----- --- ------ ------ ------ ------ -22 *** 50 1 0 if ($] >= "5.009") -27 *** 50 0 1 unless (my $return = do $file) -28 *** 0 0 0 if $@ -29 *** 0 0 0 unless defined $return -30 *** 0 0 0 unless $return -35 *** 50 0 11 unless $y -38 *** 50 0 11 unless $y or $x[0]++ -42 *** 50 11 0 unless $z -49 *** 50 0 11 if ($z) { } -82 *** 50 11 0 if exists &cond_dor +26 *** 50 0 1 unless (my $return = do $file) +27 *** 0 0 0 if $@ +28 *** 0 0 0 unless defined $return +29 *** 0 0 0 unless $return +33 *** 50 0 11 unless $y +36 *** 50 0 11 unless $y or $x[0]++ +40 *** 50 11 0 unless $z +47 *** 50 0 11 if ($z) { } +80 *** 50 11 0 if exists &cond_dor Conditions @@ -139,39 +136,39 @@ or 2 conditions line err % l !l expr ----- --- ------ ------ ------ ---- -57 100 10 1 $i || 'qqq' -58 100 10 1 $i || [] -60 *** 50 11 0 $y || 0 -61 *** 50 11 0 $y || undef -62 *** 50 0 11 $z || 0 -68 100 10 1 $x[8] ||= 1 -69 100 10 1 $x[9] ||= {} -70 100 10 1 $x[10] ||= \"foo" -71 100 10 1 $x[11] ||= \$y -72 100 10 1 $x[12] ||= \*STDIO -73 100 10 1 $x[13] ||= sub { +55 100 10 1 $i || 'qqq' +56 100 10 1 $i || [] +58 *** 50 11 0 $y || 0 +59 *** 50 11 0 $y || undef +60 *** 50 0 11 $z || 0 +66 100 10 1 $x[8] ||= 1 +67 100 10 1 $x[9] ||= {} +68 100 10 1 $x[10] ||= \"foo" +69 100 10 1 $x[11] ||= \$y +70 100 10 1 $x[12] ||= \*STDIO +71 100 10 1 $x[13] ||= sub { 1; } -74 100 10 1 $x[14] ||= *foo{"SCALAR"} -75 *** 50 0 11 $x[15] ||= *STDIO{"IO"} -76 100 10 1 $x[16] ||= bless({}, "XXX") -79 100 10 1 $x[18] ||= "blah\n" -83 *** 0 0 0 $x[19] ||= 1 +72 100 10 1 $x[14] ||= *foo{"SCALAR"} +73 *** 50 0 11 $x[15] ||= *STDIO{"IO"} +74 100 10 1 $x[16] ||= bless({}, "XXX") +77 100 10 1 $x[18] ||= "blah\n" +81 *** 0 0 0 $x[19] ||= 1 or 3 conditions line err % l !l&&r !l&&!r expr ----- --- ------ ------ ------ ------ ---- -38 *** 33 11 0 0 $y or $x[0]++ -55 *** 33 11 0 0 $y || $z -56 *** 33 0 11 0 $z || $y -64 *** 33 11 0 0 $p ||= $y -65 *** 33 11 0 0 $p ||= $z -66 *** 66 10 1 0 $x[6] ||= $y -67 *** 33 0 0 11 $x[7] ||= $z -77 100 9 1 1 $x[17] ||= $i == 1 -78 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" +36 *** 33 11 0 0 $y or $x[0]++ +53 *** 33 11 0 0 $y || $z +54 *** 33 0 11 0 $z || $y +62 *** 33 11 0 0 $p ||= $y +63 *** 33 11 0 0 $p ||= $z +64 *** 66 10 1 0 $x[6] ||= $y +65 *** 33 0 0 11 $x[7] ||= $z +75 100 9 1 1 $x[17] ||= $i == 1 +76 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" Covered Subroutines @@ -181,15 +178,15 @@ Subroutine Count Location ---------- ----- ---------------- BEGIN 1 tests/cond_or:13 BEGIN 1 tests/cond_or:14 -BEGIN 1 tests/cond_or:25 +BEGIN 1 tests/cond_or:24 Uncovered Subroutines --------------------- Subroutine Count Location ---------- ----- ---------------- -__ANON__ 0 tests/cond_or:73 -__ANON__ 0 tests/cond_or:83 +__ANON__ 0 tests/cond_or:71 +__ANON__ 0 tests/cond_or:81 tests/cond_or.pl diff --git a/test_output/cover/cond_or.5.016000 b/test_output/cover/cond_or.5.016000 index 98c3fe93..f6c1bf87 100644 --- a/test_output/cover/cond_or.5.016000 +++ b/test_output/cover/cond_or.5.016000 @@ -4,9 +4,9 @@ Reading database from ... ---------------- ------ ------ ------ ------ ------ File stmt bran cond sub total ---------------- ------ ------ ------ ------ ------ -tests/cond_or 89.6 35.0 64.4 60.0 70.4 +tests/cond_or 89.4 33.3 64.4 60.0 70.5 tests/cond_or.pl 100.0 n/a 57.5 100.0 75.7 -Total 92.9 35.0 61.6 75.0 72.1 +Total 92.8 33.3 61.6 75.0 72.2 ---------------- ------ ------ ------ ------ ------ @@ -28,8 +28,8 @@ line err stmt bran cond sub code 7 # The latest version of this software should be available from my homepage: 8 # http://www.pjcj.net 9 -10 # __COVER__ skip_test $] < 5.008 || $^O eq "cygwin" -11 # __COVER__ skip_reason Busted on 5.6 and cygwin +10 # __COVER__ skip_test $^O eq "cygwin" +11 # __COVER__ skip_reason Busted on cygwin 12 13 1 1 use strict; 1 @@ -44,75 +44,73 @@ line err stmt bran cond sub code 19 1 my $z = 0; 20 1 $::foo = 17; 21 -22 *** 1 * 50 if ($] >= 5.009) { -23 1 $ENV{PATH} = "/bin"; -24 1 system "pwd"; -25 1 1 use lib "tests"; +22 1 $ENV{PATH} = "/bin"; +23 1 system "pwd"; +24 1 1 use lib "tests"; 1 1 -26 1 my $file = "cond_or.pl"; -27 *** 1 * 50 unless (my $return = do $file) { -28 *** *0 * 0 die "couldn't parse $file: $@" if $@; -29 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; -30 *** *0 * 0 die "couldn't run $file" unless $return; -31 } -32 } -33 -34 1 for my $i (0 .. 10) { -35 *** 11 * 50 $y || -36 $x[1]++; -37 -38 *** 11 * 50 * 33 $y || -39 $x[0]++ || -40 $x[1]++; -41 -42 *** 11 * 50 $x[2]++ -43 unless $z; -44 -45 11 for (0 .. 2) { -46 33 $x[3]++; -47 } -48 -49 *** 11 * 50 if ($z) { -50 *** *0 $x[4]++; -51 } else { -52 11 $x[5]++; -53 } -54 -55 *** 11 * 33 my $p = $y || $z; -56 *** 11 * 33 my $q = $z || $y; -57 11 100 my $r = $i || "qqq"; -58 11 100 my $s = $i || []; -59 11 my $t = $y | $z; -60 *** 11 * 50 my $u = $y || 0; -61 *** 11 * 50 my $v = $y || undef; -62 *** 11 * 50 my $w = $z || 0; -63 -64 *** 11 * 33 $p ||= $y; -65 *** 11 * 33 $p ||= $z; -66 *** 11 * 66 $x[ 6] ||= $y; -67 *** 11 * 33 $x[ 7] ||= $z; -68 11 100 $x[ 8] ||= 1; -69 11 100 $x[ 9] ||= {}; -70 11 100 $x[10] ||= \"foo"; -71 11 100 $x[11] ||= \$y; -72 11 100 $x[12] ||= \*STDIO; -73 *** 11 100 *0 $x[13] ||= sub { 1 }; +25 1 my $file = "cond_or.pl"; +26 *** 1 * 50 unless (my $return = do $file) { +27 *** *0 * 0 die "couldn't parse $file: $@" if $@; +28 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; +29 *** *0 * 0 die "couldn't run $file" unless $return; +30 } +31 +32 1 for my $i (0 .. 10) { +33 *** 11 * 50 $y || +34 $x[1]++; +35 +36 *** 11 * 50 * 33 $y || +37 $x[0]++ || +38 $x[1]++; +39 +40 *** 11 * 50 $x[2]++ +41 unless $z; +42 +43 11 for (0 .. 2) { +44 33 $x[3]++; +45 } +46 +47 *** 11 * 50 if ($z) { +48 *** *0 $x[4]++; +49 } else { +50 11 $x[5]++; +51 } +52 +53 *** 11 * 33 my $p = $y || $z; +54 *** 11 * 33 my $q = $z || $y; +55 11 100 my $r = $i || "qqq"; +56 11 100 my $s = $i || []; +57 11 my $t = $y | $z; +58 *** 11 * 50 my $u = $y || 0; +59 *** 11 * 50 my $v = $y || undef; +60 *** 11 * 50 my $w = $z || 0; +61 +62 *** 11 * 33 $p ||= $y; +63 *** 11 * 33 $p ||= $z; +64 *** 11 * 66 $x[ 6] ||= $y; +65 *** 11 * 33 $x[ 7] ||= $z; +66 11 100 $x[ 8] ||= 1; +67 11 100 $x[ 9] ||= {}; +68 11 100 $x[10] ||= \"foo"; +69 11 100 $x[11] ||= \$y; +70 11 100 $x[12] ||= \*STDIO; +71 *** 11 100 *0 $x[13] ||= sub { 1 }; *** *0 -74 11 100 $x[14] ||= *::foo{SCALAR}; -75 *** 11 * 50 $x[15] ||= *STDIO{IO}; -76 11 100 $x[16] ||= bless {}, "XXX"; -77 11 100 $x[17] ||= $i == 1; -78 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; -79 11 100 $x[18] ||= <<"EOD"; -80 blah -81 EOD -82 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; -83 *** 11 * 0 *0 sub { $x[19] ||= 1 }; +72 11 100 $x[14] ||= *::foo{SCALAR}; +73 *** 11 * 50 $x[15] ||= *STDIO{IO}; +74 11 100 $x[16] ||= bless {}, "XXX"; +75 11 100 $x[17] ||= $i == 1; +76 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; +77 11 100 $x[18] ||= <<"EOD"; +78 blah +79 EOD +80 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; +81 *** 11 * 0 *0 sub { $x[19] ||= 1 }; *** *0 -84 } -85 -86 # print join(", ", @x), "\n"; +82 } +83 +84 # print join(", ", @x), "\n"; Branches @@ -120,16 +118,15 @@ Branches line err % true false branch ----- --- ------ ------ ------ ------ -22 *** 50 1 0 if ($] >= "5.009") -27 *** 50 0 1 unless (my $return = do $file) -28 *** 0 0 0 if $@ -29 *** 0 0 0 unless defined $return -30 *** 0 0 0 unless $return -35 *** 50 0 11 unless $y -38 *** 50 0 11 unless $y or $x[0]++ -42 *** 50 11 0 unless $z -49 *** 50 0 11 if ($z) { } -82 *** 50 11 0 if exists &cond_dor +26 *** 50 0 1 unless (my $return = do $file) +27 *** 0 0 0 if $@ +28 *** 0 0 0 unless defined $return +29 *** 0 0 0 unless $return +33 *** 50 0 11 unless $y +36 *** 50 0 11 unless $y or $x[0]++ +40 *** 50 11 0 unless $z +47 *** 50 0 11 if ($z) { } +80 *** 50 11 0 if exists &cond_dor Conditions @@ -139,39 +136,39 @@ or 2 conditions line err % l !l expr ----- --- ------ ------ ------ ---- -57 100 10 1 $i || 'qqq' -58 100 10 1 $i || [] -60 *** 50 11 0 $y || 0 -61 *** 50 11 0 $y || undef -62 *** 50 0 11 $z || 0 -68 100 10 1 $x[8] ||= 1 -69 100 10 1 $x[9] ||= {} -70 100 10 1 $x[10] ||= \"foo" -71 100 10 1 $x[11] ||= \$y -72 100 10 1 $x[12] ||= \*STDIO -73 100 10 1 $x[13] ||= sub { +55 100 10 1 $i || 'qqq' +56 100 10 1 $i || [] +58 *** 50 11 0 $y || 0 +59 *** 50 11 0 $y || undef +60 *** 50 0 11 $z || 0 +66 100 10 1 $x[8] ||= 1 +67 100 10 1 $x[9] ||= {} +68 100 10 1 $x[10] ||= \"foo" +69 100 10 1 $x[11] ||= \$y +70 100 10 1 $x[12] ||= \*STDIO +71 100 10 1 $x[13] ||= sub { 1; } -74 100 10 1 $x[14] ||= *foo{"SCALAR"} -75 *** 50 0 11 $x[15] ||= *STDIO{"IO"} -76 100 10 1 $x[16] ||= bless({}, "XXX") -79 100 10 1 $x[18] ||= "blah\n" -83 *** 0 0 0 $x[19] ||= 1 +72 100 10 1 $x[14] ||= *foo{"SCALAR"} +73 *** 50 0 11 $x[15] ||= *STDIO{"IO"} +74 100 10 1 $x[16] ||= bless({}, "XXX") +77 100 10 1 $x[18] ||= "blah\n" +81 *** 0 0 0 $x[19] ||= 1 or 3 conditions line err % l !l&&r !l&&!r expr ----- --- ------ ------ ------ ------ ---- -38 *** 33 11 0 0 $y or $x[0]++ -55 *** 33 11 0 0 $y || $z -56 *** 33 0 11 0 $z || $y -64 *** 33 11 0 0 $p ||= $y -65 *** 33 11 0 0 $p ||= $z -66 *** 66 10 1 0 $x[6] ||= $y -67 *** 33 0 0 11 $x[7] ||= $z -77 100 9 1 1 $x[17] ||= $i == 1 -78 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" +36 *** 33 11 0 0 $y or $x[0]++ +53 *** 33 11 0 0 $y || $z +54 *** 33 0 11 0 $z || $y +62 *** 33 11 0 0 $p ||= $y +63 *** 33 11 0 0 $p ||= $z +64 *** 66 10 1 0 $x[6] ||= $y +65 *** 33 0 0 11 $x[7] ||= $z +75 100 9 1 1 $x[17] ||= $i == 1 +76 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" Covered Subroutines @@ -181,15 +178,15 @@ Subroutine Count Location ---------- ----- ---------------- BEGIN 1 tests/cond_or:13 BEGIN 1 tests/cond_or:14 -BEGIN 1 tests/cond_or:25 +BEGIN 1 tests/cond_or:24 Uncovered Subroutines --------------------- Subroutine Count Location ---------- ----- ---------------- -__ANON__ 0 tests/cond_or:73 -__ANON__ 0 tests/cond_or:83 +__ANON__ 0 tests/cond_or:71 +__ANON__ 0 tests/cond_or:81 tests/cond_or.pl diff --git a/test_output/cover/cond_or.5.022000 b/test_output/cover/cond_or.5.022000 index 8bc464cf..482a9959 100644 --- a/test_output/cover/cond_or.5.022000 +++ b/test_output/cover/cond_or.5.022000 @@ -4,9 +4,9 @@ Reading database from ... ---------------- ------ ------ ------ ------ ------ File stmt bran cond sub total ---------------- ------ ------ ------ ------ ------ -tests/cond_or 89.6 35.0 64.4 60.0 70.4 +tests/cond_or 89.4 33.3 64.4 60.0 70.5 tests/cond_or.pl 100.0 n/a 57.5 100.0 75.7 -Total 92.9 35.0 61.6 75.0 72.1 +Total 92.8 33.3 61.6 75.0 72.2 ---------------- ------ ------ ------ ------ ------ @@ -28,8 +28,8 @@ line err stmt bran cond sub code 7 # The latest version of this software should be available from my homepage: 8 # http://www.pjcj.net 9 -10 # __COVER__ skip_test $] < 5.008 || $^O eq "cygwin" -11 # __COVER__ skip_reason Busted on 5.6 and cygwin +10 # __COVER__ skip_test $^O eq "cygwin" +11 # __COVER__ skip_reason Busted on cygwin 12 13 1 1 use strict; 1 @@ -44,75 +44,73 @@ line err stmt bran cond sub code 19 1 my $z = 0; 20 1 $::foo = 17; 21 -22 *** 1 * 50 if ($] >= 5.009) { -23 1 $ENV{PATH} = "/bin"; -24 1 system "pwd"; -25 1 1 use lib "tests"; +22 1 $ENV{PATH} = "/bin"; +23 1 system "pwd"; +24 1 1 use lib "tests"; 1 1 -26 1 my $file = "cond_or.pl"; -27 *** 1 * 50 unless (my $return = do $file) { -28 *** *0 * 0 die "couldn't parse $file: $@" if $@; -29 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; -30 *** *0 * 0 die "couldn't run $file" unless $return; -31 } -32 } -33 -34 1 for my $i (0 .. 10) { -35 *** 11 * 50 $y || -36 $x[1]++; -37 -38 *** 11 * 50 * 33 $y || -39 $x[0]++ || -40 $x[1]++; -41 -42 *** 11 * 50 $x[2]++ -43 unless $z; -44 -45 11 for (0 .. 2) { -46 33 $x[3]++; -47 } -48 -49 *** 11 * 50 if ($z) { -50 *** *0 $x[4]++; -51 } else { -52 11 $x[5]++; -53 } -54 -55 *** 11 * 33 my $p = $y || $z; -56 *** 11 * 33 my $q = $z || $y; -57 11 100 my $r = $i || "qqq"; -58 11 100 my $s = $i || []; -59 11 my $t = $y | $z; -60 *** 11 * 50 my $u = $y || 0; -61 *** 11 * 50 my $v = $y || undef; -62 *** 11 * 50 my $w = $z || 0; -63 -64 *** 11 * 33 $p ||= $y; -65 *** 11 * 33 $p ||= $z; -66 *** 11 * 66 $x[ 6] ||= $y; -67 *** 11 * 33 $x[ 7] ||= $z; -68 11 100 $x[ 8] ||= 1; -69 11 100 $x[ 9] ||= {}; -70 11 100 $x[10] ||= \"foo"; -71 11 100 $x[11] ||= \$y; -72 11 100 $x[12] ||= \*STDIO; -73 *** 11 100 *0 $x[13] ||= sub { 1 }; +25 1 my $file = "cond_or.pl"; +26 *** 1 * 50 unless (my $return = do $file) { +27 *** *0 * 0 die "couldn't parse $file: $@" if $@; +28 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; +29 *** *0 * 0 die "couldn't run $file" unless $return; +30 } +31 +32 1 for my $i (0 .. 10) { +33 *** 11 * 50 $y || +34 $x[1]++; +35 +36 *** 11 * 50 * 33 $y || +37 $x[0]++ || +38 $x[1]++; +39 +40 *** 11 * 50 $x[2]++ +41 unless $z; +42 +43 11 for (0 .. 2) { +44 33 $x[3]++; +45 } +46 +47 *** 11 * 50 if ($z) { +48 *** *0 $x[4]++; +49 } else { +50 11 $x[5]++; +51 } +52 +53 *** 11 * 33 my $p = $y || $z; +54 *** 11 * 33 my $q = $z || $y; +55 11 100 my $r = $i || "qqq"; +56 11 100 my $s = $i || []; +57 11 my $t = $y | $z; +58 *** 11 * 50 my $u = $y || 0; +59 *** 11 * 50 my $v = $y || undef; +60 *** 11 * 50 my $w = $z || 0; +61 +62 *** 11 * 33 $p ||= $y; +63 *** 11 * 33 $p ||= $z; +64 *** 11 * 66 $x[ 6] ||= $y; +65 *** 11 * 33 $x[ 7] ||= $z; +66 11 100 $x[ 8] ||= 1; +67 11 100 $x[ 9] ||= {}; +68 11 100 $x[10] ||= \"foo"; +69 11 100 $x[11] ||= \$y; +70 11 100 $x[12] ||= \*STDIO; +71 *** 11 100 *0 $x[13] ||= sub { 1 }; *** *0 -74 11 100 $x[14] ||= *::foo{SCALAR}; -75 *** 11 * 50 $x[15] ||= *STDIO{IO}; -76 11 100 $x[16] ||= bless {}, "XXX"; -77 11 100 $x[17] ||= $i == 1; -78 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; -79 11 100 $x[18] ||= <<"EOD"; -80 blah -81 EOD -82 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; -83 *** 11 * 0 *0 sub { $x[19] ||= 1 }; +72 11 100 $x[14] ||= *::foo{SCALAR}; +73 *** 11 * 50 $x[15] ||= *STDIO{IO}; +74 11 100 $x[16] ||= bless {}, "XXX"; +75 11 100 $x[17] ||= $i == 1; +76 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; +77 11 100 $x[18] ||= <<"EOD"; +78 blah +79 EOD +80 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; +81 *** 11 * 0 *0 sub { $x[19] ||= 1 }; *** *0 -84 } -85 -86 # print join(", ", @x), "\n"; +82 } +83 +84 # print join(", ", @x), "\n"; Branches @@ -120,16 +118,15 @@ Branches line err % true false branch ----- --- ------ ------ ------ ------ -22 *** 50 1 0 if ($] >= "5.009") -27 *** 50 0 1 unless (my $return = do $file) -28 *** 0 0 0 if $@ -29 *** 0 0 0 unless defined $return -30 *** 0 0 0 unless $return -35 *** 50 0 11 unless $y -38 *** 50 0 11 unless $y or $x[0]++ -42 *** 50 11 0 unless $z -49 *** 50 0 11 if ($z) { } -82 *** 50 11 0 if exists &main::cond_dor +26 *** 50 0 1 unless (my $return = do $file) +27 *** 0 0 0 if $@ +28 *** 0 0 0 unless defined $return +29 *** 0 0 0 unless $return +33 *** 50 0 11 unless $y +36 *** 50 0 11 unless $y or $x[0]++ +40 *** 50 11 0 unless $z +47 *** 50 0 11 if ($z) { } +80 *** 50 11 0 if exists &main::cond_dor Conditions @@ -139,39 +136,39 @@ or 2 conditions line err % l !l expr ----- --- ------ ------ ------ ---- -57 100 10 1 $i || 'qqq' -58 100 10 1 $i || [] -60 *** 50 11 0 $y || 0 -61 *** 50 11 0 $y || undef -62 *** 50 0 11 $z || 0 -68 100 10 1 $x[8] ||= 1 -69 100 10 1 $x[9] ||= {} -70 100 10 1 $x[10] ||= \"foo" -71 100 10 1 $x[11] ||= \$y -72 100 10 1 $x[12] ||= \*STDIO -73 100 10 1 $x[13] ||= sub { +55 100 10 1 $i || 'qqq' +56 100 10 1 $i || [] +58 *** 50 11 0 $y || 0 +59 *** 50 11 0 $y || undef +60 *** 50 0 11 $z || 0 +66 100 10 1 $x[8] ||= 1 +67 100 10 1 $x[9] ||= {} +68 100 10 1 $x[10] ||= \"foo" +69 100 10 1 $x[11] ||= \$y +70 100 10 1 $x[12] ||= \*STDIO +71 100 10 1 $x[13] ||= sub { 1; } -74 100 10 1 $x[14] ||= *foo{"SCALAR"} -75 *** 50 0 11 $x[15] ||= *STDIO{"IO"} -76 100 10 1 $x[16] ||= bless({}, "XXX") -79 100 10 1 $x[18] ||= "blah\n" -83 *** 0 0 0 $x[19] ||= 1 +72 100 10 1 $x[14] ||= *foo{"SCALAR"} +73 *** 50 0 11 $x[15] ||= *STDIO{"IO"} +74 100 10 1 $x[16] ||= bless({}, "XXX") +77 100 10 1 $x[18] ||= "blah\n" +81 *** 0 0 0 $x[19] ||= 1 or 3 conditions line err % l !l&&r !l&&!r expr ----- --- ------ ------ ------ ------ ---- -38 *** 33 11 0 0 $y or $x[0]++ -55 *** 33 11 0 0 $y || $z -56 *** 33 0 11 0 $z || $y -64 *** 33 11 0 0 $p ||= $y -65 *** 33 11 0 0 $p ||= $z -66 *** 66 10 1 0 $x[6] ||= $y -67 *** 33 0 0 11 $x[7] ||= $z -77 100 9 1 1 $x[17] ||= $i == 1 -78 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" +36 *** 33 11 0 0 $y or $x[0]++ +53 *** 33 11 0 0 $y || $z +54 *** 33 0 11 0 $z || $y +62 *** 33 11 0 0 $p ||= $y +63 *** 33 11 0 0 $p ||= $z +64 *** 66 10 1 0 $x[6] ||= $y +65 *** 33 0 0 11 $x[7] ||= $z +75 100 9 1 1 $x[17] ||= $i == 1 +76 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" Covered Subroutines @@ -181,15 +178,15 @@ Subroutine Count Location ---------- ----- ---------------- BEGIN 1 tests/cond_or:13 BEGIN 1 tests/cond_or:14 -BEGIN 1 tests/cond_or:25 +BEGIN 1 tests/cond_or:24 Uncovered Subroutines --------------------- Subroutine Count Location ---------- ----- ---------------- -__ANON__ 0 tests/cond_or:73 -__ANON__ 0 tests/cond_or:83 +__ANON__ 0 tests/cond_or:71 +__ANON__ 0 tests/cond_or:81 tests/cond_or.pl diff --git a/test_output/cover/cond_or.5.038000 b/test_output/cover/cond_or.5.038000 index 2c6c3ce3..ddaa2992 100644 --- a/test_output/cover/cond_or.5.038000 +++ b/test_output/cover/cond_or.5.038000 @@ -4,9 +4,9 @@ Reading database from ... ---------------- ------ ------ ------ ------ ------ File stmt bran cond sub total ---------------- ------ ------ ------ ------ ------ -tests/cond_or 89.6 35.0 63.3 60.0 69.9 +tests/cond_or 89.4 33.3 63.3 60.0 70.0 tests/cond_or.pl 100.0 n/a 57.5 100.0 75.7 -Total 92.9 35.0 61.0 75.0 71.8 +Total 92.8 33.3 61.0 75.0 71.9 ---------------- ------ ------ ------ ------ ------ @@ -28,8 +28,8 @@ line err stmt bran cond sub code 7 # The latest version of this software should be available from my homepage: 8 # http://www.pjcj.net 9 -10 # __COVER__ skip_test $] < 5.008 || $^O eq "cygwin" -11 # __COVER__ skip_reason Busted on 5.6 and cygwin +10 # __COVER__ skip_test $^O eq "cygwin" +11 # __COVER__ skip_reason Busted on cygwin 12 13 1 1 use strict; 1 @@ -44,75 +44,73 @@ line err stmt bran cond sub code 19 1 my $z = 0; 20 1 $::foo = 17; 21 -22 *** 1 * 50 if ($] >= 5.009) { -23 1 $ENV{PATH} = "/bin"; -24 1 system "pwd"; -25 1 1 use lib "tests"; +22 1 $ENV{PATH} = "/bin"; +23 1 system "pwd"; +24 1 1 use lib "tests"; 1 1 -26 1 my $file = "cond_or.pl"; -27 *** 1 * 50 unless (my $return = do $file) { -28 *** *0 * 0 die "couldn't parse $file: $@" if $@; -29 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; -30 *** *0 * 0 die "couldn't run $file" unless $return; -31 } -32 } -33 -34 1 for my $i (0 .. 10) { -35 *** 11 * 50 $y || -36 $x[1]++; -37 -38 *** 11 * 50 * 33 $y || -39 $x[0]++ || -40 $x[1]++; -41 -42 *** 11 * 50 $x[2]++ -43 unless $z; -44 -45 11 for (0 .. 2) { -46 33 $x[3]++; -47 } -48 -49 *** 11 * 50 if ($z) { -50 *** *0 $x[4]++; -51 } else { -52 11 $x[5]++; -53 } -54 -55 *** 11 * 33 my $p = $y || $z; -56 *** 11 * 33 my $q = $z || $y; -57 11 100 my $r = $i || "qqq"; -58 11 100 my $s = $i || []; -59 11 my $t = $y | $z; -60 *** 11 * 50 my $u = $y || 0; -61 *** 11 * 50 my $v = $y || undef; -62 *** 11 * 50 my $w = $z || 0; -63 -64 *** 11 * 33 $p ||= $y; -65 *** 11 * 33 $p ||= $z; -66 *** 11 * 66 $x[ 6] ||= $y; -67 *** 11 * 33 $x[ 7] ||= $z; -68 11 100 $x[ 8] ||= 1; -69 11 100 $x[ 9] ||= {}; -70 11 100 $x[10] ||= \"foo"; -71 11 100 $x[11] ||= \$y; -72 11 100 $x[12] ||= \*STDIO; -73 *** 11 * 66 *0 $x[13] ||= sub { 1 }; +25 1 my $file = "cond_or.pl"; +26 *** 1 * 50 unless (my $return = do $file) { +27 *** *0 * 0 die "couldn't parse $file: $@" if $@; +28 *** *0 * 0 die "couldn't do $file: $!" unless defined $return; +29 *** *0 * 0 die "couldn't run $file" unless $return; +30 } +31 +32 1 for my $i (0 .. 10) { +33 *** 11 * 50 $y || +34 $x[1]++; +35 +36 *** 11 * 50 * 33 $y || +37 $x[0]++ || +38 $x[1]++; +39 +40 *** 11 * 50 $x[2]++ +41 unless $z; +42 +43 11 for (0 .. 2) { +44 33 $x[3]++; +45 } +46 +47 *** 11 * 50 if ($z) { +48 *** *0 $x[4]++; +49 } else { +50 11 $x[5]++; +51 } +52 +53 *** 11 * 33 my $p = $y || $z; +54 *** 11 * 33 my $q = $z || $y; +55 11 100 my $r = $i || "qqq"; +56 11 100 my $s = $i || []; +57 11 my $t = $y | $z; +58 *** 11 * 50 my $u = $y || 0; +59 *** 11 * 50 my $v = $y || undef; +60 *** 11 * 50 my $w = $z || 0; +61 +62 *** 11 * 33 $p ||= $y; +63 *** 11 * 33 $p ||= $z; +64 *** 11 * 66 $x[ 6] ||= $y; +65 *** 11 * 33 $x[ 7] ||= $z; +66 11 100 $x[ 8] ||= 1; +67 11 100 $x[ 9] ||= {}; +68 11 100 $x[10] ||= \"foo"; +69 11 100 $x[11] ||= \$y; +70 11 100 $x[12] ||= \*STDIO; +71 *** 11 * 66 *0 $x[13] ||= sub { 1 }; *** *0 -74 11 100 $x[14] ||= *::foo{SCALAR}; -75 *** 11 * 50 $x[15] ||= *STDIO{IO}; -76 11 100 $x[16] ||= bless {}, "XXX"; -77 11 100 $x[17] ||= $i == 1; -78 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; -79 11 100 $x[18] ||= <<"EOD"; -80 blah -81 EOD -82 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; -83 *** 11 * 0 *0 sub { $x[19] ||= 1 }; +72 11 100 $x[14] ||= *::foo{SCALAR}; +73 *** 11 * 50 $x[15] ||= *STDIO{IO}; +74 11 100 $x[16] ||= bless {}, "XXX"; +75 11 100 $x[17] ||= $i == 1; +76 *** 11 * 33 $w ||= ref($i) eq "SCALAR"; +77 11 100 $x[18] ||= <<"EOD"; +78 blah +79 EOD +80 *** 11 * 50 cond_dor(\@x) if exists &cond_dor; +81 *** 11 * 0 *0 sub { $x[19] ||= 1 }; *** *0 -84 } -85 -86 # print join(", ", @x), "\n"; +82 } +83 +84 # print join(", ", @x), "\n"; Branches @@ -120,16 +118,15 @@ Branches line err % true false branch ----- --- ------ ------ ------ ------ -22 *** 50 1 0 if ($] >= "5.009") -27 *** 50 0 1 unless (my $return = do $file) -28 *** 0 0 0 if $@ -29 *** 0 0 0 unless defined $return -30 *** 0 0 0 unless $return -35 *** 50 0 11 unless $y -38 *** 50 0 11 unless $y or $x[0]++ -42 *** 50 11 0 unless $z -49 *** 50 0 11 if ($z) { } -82 *** 50 11 0 if exists &main::cond_dor +26 *** 50 0 1 unless (my $return = do $file) +27 *** 0 0 0 if $@ +28 *** 0 0 0 unless defined $return +29 *** 0 0 0 unless $return +33 *** 50 0 11 unless $y +36 *** 50 0 11 unless $y or $x[0]++ +40 *** 50 11 0 unless $z +47 *** 50 0 11 if ($z) { } +80 *** 50 11 0 if exists &main::cond_dor Conditions @@ -139,39 +136,39 @@ or 2 conditions line err % l !l expr ----- --- ------ ------ ------ ---- -57 100 10 1 $i || 'qqq' -58 100 10 1 $i || [] -60 *** 50 11 0 $y || 0 -61 *** 50 11 0 $y || undef -62 *** 50 0 11 $z || 0 -68 100 10 1 $x[8] ||= 1 -69 100 10 1 $x[9] ||= {} -70 100 10 1 $x[10] ||= \"foo" -71 100 10 1 $x[11] ||= \$y -72 100 10 1 $x[12] ||= \*STDIO -74 100 10 1 $x[14] ||= *foo{"SCALAR"} -75 *** 50 0 11 $x[15] ||= *STDIO{"IO"} -76 100 10 1 $x[16] ||= bless({}, "XXX") -79 100 10 1 $x[18] ||= "blah\n" -83 *** 0 0 0 $x[19] ||= 1 +55 100 10 1 $i || 'qqq' +56 100 10 1 $i || [] +58 *** 50 11 0 $y || 0 +59 *** 50 11 0 $y || undef +60 *** 50 0 11 $z || 0 +66 100 10 1 $x[8] ||= 1 +67 100 10 1 $x[9] ||= {} +68 100 10 1 $x[10] ||= \"foo" +69 100 10 1 $x[11] ||= \$y +70 100 10 1 $x[12] ||= \*STDIO +72 100 10 1 $x[14] ||= *foo{"SCALAR"} +73 *** 50 0 11 $x[15] ||= *STDIO{"IO"} +74 100 10 1 $x[16] ||= bless({}, "XXX") +77 100 10 1 $x[18] ||= "blah\n" +81 *** 0 0 0 $x[19] ||= 1 or 3 conditions line err % l !l&&r !l&&!r expr ----- --- ------ ------ ------ ------ ---- -38 *** 33 11 0 0 $y or $x[0]++ -55 *** 33 11 0 0 $y || $z -56 *** 33 0 11 0 $z || $y -64 *** 33 11 0 0 $p ||= $y -65 *** 33 11 0 0 $p ||= $z -66 *** 66 10 1 0 $x[6] ||= $y -67 *** 33 0 0 11 $x[7] ||= $z -73 *** 66 10 1 0 $x[13] ||= sub { +36 *** 33 11 0 0 $y or $x[0]++ +53 *** 33 11 0 0 $y || $z +54 *** 33 0 11 0 $z || $y +62 *** 33 11 0 0 $p ||= $y +63 *** 33 11 0 0 $p ||= $z +64 *** 66 10 1 0 $x[6] ||= $y +65 *** 33 0 0 11 $x[7] ||= $z +71 *** 66 10 1 0 $x[13] ||= sub { 1; } -77 100 9 1 1 $x[17] ||= $i == 1 -78 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" +75 100 9 1 1 $x[17] ||= $i == 1 +76 *** 33 0 0 11 $w ||= ref $i eq "SCALAR" Covered Subroutines @@ -181,15 +178,15 @@ Subroutine Count Location ---------- ----- ---------------- BEGIN 1 tests/cond_or:13 BEGIN 1 tests/cond_or:14 -BEGIN 1 tests/cond_or:25 +BEGIN 1 tests/cond_or:24 Uncovered Subroutines --------------------- Subroutine Count Location ---------- ----- ---------------- -__ANON__ 0 tests/cond_or:73 -__ANON__ 0 tests/cond_or:83 +__ANON__ 0 tests/cond_or:71 +__ANON__ 0 tests/cond_or:81 tests/cond_or.pl diff --git a/tests/cond_or b/tests/cond_or index e1d1a752..077e3197 100644 --- a/tests/cond_or +++ b/tests/cond_or @@ -7,8 +7,8 @@ # The latest version of this software should be available from my homepage: # http://www.pjcj.net -# __COVER__ skip_test $] < 5.008 || $^O eq "cygwin" -# __COVER__ skip_reason Busted on 5.6 and cygwin +# __COVER__ skip_test $^O eq "cygwin" +# __COVER__ skip_reason Busted on cygwin use strict; use warnings; @@ -19,16 +19,14 @@ my $y = 1; my $z = 0; $::foo = 17; -if ($] >= 5.009) { - $ENV{PATH} = "/bin"; - system "pwd"; - use lib "tests"; - my $file = "cond_or.pl"; - unless (my $return = do $file) { - die "couldn't parse $file: $@" if $@; - die "couldn't do $file: $!" unless defined $return; - die "couldn't run $file" unless $return; - } +$ENV{PATH} = "/bin"; +system "pwd"; +use lib "tests"; +my $file = "cond_or.pl"; +unless (my $return = do $file) { + die "couldn't parse $file: $@" if $@; + die "couldn't do $file: $!" unless defined $return; + die "couldn't run $file" unless $return; } for my $i (0 .. 10) {