Lines 15-28
Link Here
|
15 |
# You should have received a copy of the GNU General Public License |
15 |
# You should have received a copy of the GNU General Public License |
16 |
# along with Koha; if not, see <http://www.gnu.org/licenses>. |
16 |
# along with Koha; if not, see <http://www.gnu.org/licenses>. |
17 |
|
17 |
|
18 |
use strict; |
18 |
use Modern::Perl; |
19 |
use warnings; |
|
|
20 |
|
19 |
|
21 |
use Test::More; |
20 |
use Test::More tests => 1; |
22 |
use File::Spec; |
21 |
use File::Spec; |
23 |
use File::Find; |
22 |
use File::Find; |
24 |
use IO::File; |
23 |
use IO::File; |
25 |
|
24 |
|
|
|
25 |
my @failures; |
26 |
find({ |
26 |
find({ |
27 |
bydepth => 1, |
27 |
bydepth => 1, |
28 |
no_chdir => 1, |
28 |
no_chdir => 1, |
Lines 48-58
find({
Link Here
|
48 |
} |
48 |
} |
49 |
} |
49 |
} |
50 |
close $fh; |
50 |
close $fh; |
51 |
if ($marker_found) { |
51 |
push @failures, $file if $marker_found; |
52 |
fail("$file contains merge conflict markers in line $line"); |
52 |
}, |
53 |
} else { |
|
|
54 |
pass("$file has no merge conflict markers"); |
55 |
} |
56 |
}, |
57 |
}, File::Spec->curdir()); |
53 |
}, File::Spec->curdir()); |
58 |
done_testing(); |
54 |
|
|
|
55 |
is( @failures, 0, 'Files should not contain merge markers' . ( @failures ? ( ' (' . join( ', ', @failures ) . ' )' ) : '' ) ); |
59 |
- |
|
|