Skip to content

Commit dc4f4f4

Browse files
oodler577oodler577
committed
added skip to cmp_deeply tests when $] is < 5.12
1 parent 5b08029 commit dc4f4f4

15 files changed

+204
-37
lines changed

‎t-flapping/12-PerlOMP_2D_AoA_TO_2D_INT_ARRAY_r.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -61,8 +69,13 @@ foreach my $thread_count (qw/2/) {
6169
my $seen_threads = shift @$aref_new;
6270
is $seen_rows, scalar @$aref_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6371
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
64-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
65-
cmp_deeply $aref_new, $expected, qq{PerlOMP_2D_AoA_TO_2D_INT_ARRAY worked to convert original ARRAY reference to raw C 2D array of ints};
72+
if ($has_test_deep) {
73+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
74+
cmp_deeply $aref_new, $expected, qq{PerlOMP_2D_AoA_TO_2D_INT_ARRAY worked to convert original ARRAY reference to raw C 2D array of ints};
75+
}
76+
else {
77+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
78+
}
6679
}
6780

6881
done_testing;

‎t-skipped/16-PerlOMP_2D_AoA_TO_2D_INT_ARRAY_r.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -61,8 +69,13 @@ foreach my $thread_count (qw/2/) {
6169
my $seen_threads = shift @$aref_new;
6270
is $seen_rows, scalar @$aref_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6371
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
64-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
65-
cmp_deeply $aref_new, $expected, qq{PerlOMP_2D_AoA_TO_2D_INT_ARRAY worked to convert original ARRAY reference to raw C 2D array of ints};
72+
if ($has_test_deep) {
73+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
74+
cmp_deeply $aref_new, $expected, qq{PerlOMP_2D_AoA_TO_2D_INT_ARRAY worked to convert original ARRAY reference to raw C 2D array of ints};
75+
}
76+
else {
77+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
78+
}
6679
}
6780

6881
done_testing;

‎t/00-PerlOMP_Array_Counting.t

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
87

98
# build and load subroutines
109
use OpenMP::Simple;

‎t/11-PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -66,8 +74,13 @@ SKIP: {
6674
my $seen_threads = shift @$aref_new;
6775
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6876
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
69-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
70-
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
77+
if ($has_test_deep) {
78+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
79+
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
80+
}
81+
else {
82+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
83+
}
7184
}
7285
}
7386
};

‎t/11-PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY_r.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -66,8 +74,13 @@ SKIP: {
6674
my $seen_threads = shift @$aref_new;
6775
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6876
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
69-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
70-
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
77+
if ($has_test_deep) {
78+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
79+
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_FLOAT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
80+
}
81+
else {
82+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
83+
}
7184
}
7285
}
7386
};

‎t/12-PerlOMP_1D_Array_TO_1D_INT_ARRAY.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -60,8 +68,13 @@ foreach my $thread_count (qw/1 4 8/) {
6068
my $seen_threads = shift @$aref_new;
6169
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6270
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
63-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
64-
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_INT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
71+
if ($has_test_deep) {
72+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
73+
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_INT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
74+
}
75+
else {
76+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
77+
}
6578
}
6679
}
6780

‎t/12-PerlOMP_1D_Array_TO_1D_INT_ARRAY_r.t

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -60,8 +68,13 @@ foreach my $thread_count (qw/1 4 8/) {
6068
my $seen_threads = shift @$aref_new;
6169
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
6270
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
63-
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
64-
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_INT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
71+
if ($has_test_deep) {
72+
cmp_deeply $aref_new, $expected, qq{Row summed array ref returned as expected from $thread_count OpenMP threads};
73+
cmp_deeply $aref_new, $expected, qq{PerlOMP_1D_Array_TO_1D_INT_ARRAY worked to convert original ARRAY reference to raw C 1D array of floats};
74+
}
75+
else {
76+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 2; }
77+
}
6578
}
6679
}
6780

‎t/13-PerlOMP_1D_Array_TO_1D_STRING_ARRAY.t

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -57,7 +65,12 @@ foreach my $thread_count (qw/1 4 8/) {
5765
my $seen_threads = shift @$aref_new;
5866
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
5967
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
60-
cmp_deeply $aref_new, $row_orig, qq{Row passed by reference matches the row constructed and returned by reference};;
68+
if ($has_test_deep) {
69+
cmp_deeply $aref_new, $row_orig, qq{Row passed by reference matches the row constructed and returned by reference};;
70+
}
71+
else {
72+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 1; }
73+
}
6174
}
6275
}
6376

‎t/13-PerlOMP_1D_Array_TO_1D_STRING_ARRAY_r.t

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
7+
8+
my $has_test_deep = 1;
9+
BEGIN {
10+
if ($] < 5.012) {
11+
$has_test_deep = 0;
12+
} else {
13+
eval { require Test::Deep; Test::Deep->import(); 1 } or $has_test_deep = 0;
14+
}
15+
}
816

917
# build and load subroutines
1018
use OpenMP::Simple;
@@ -57,7 +65,12 @@ foreach my $thread_count (qw/1 4 8/) {
5765
my $seen_threads = shift @$aref_new;
5866
is $seen_elements, scalar @$row_orig, q{PerlOMP_1D_Array_NUM_ELEMENTS works on original ARRAY reference};
5967
is $seen_threads, $thread_count, qq{OMP_NUM_THREADS=$thread_count is respected inside of the, omp parallel section, as expected};
60-
cmp_deeply $aref_new, $row_orig, qq{Row passed by reference matches the row constructed and returned by reference};;
68+
if ($has_test_deep) {
69+
cmp_deeply $aref_new, $row_orig, qq{Row passed by reference matches the row constructed and returned by reference};;
70+
}
71+
else {
72+
SKIP: { skip "Skipping cmp_deeply tests because Perl is below 5.12 or Test::Deep is unavailable", 1; }
73+
}
6174
}
6275
}
6376

‎t/13-PerlOMP_Array_Counting.t

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use warnings;
44
use strict;
55

66
use Test::More;
7-
use Test::Deep;
87

98
# build and load subroutines
109
use OpenMP::Simple;

0 commit comments

Comments
 (0)