summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwurblzap%gmail.com <>2009-03-01 11:31:14 +0100
committerwurblzap%gmail.com <>2009-03-01 11:31:14 +0100
commite43d323b6348537adf58d8f1b8b5d1193220f7ac (patch)
tree4297233c7b0da63c7bc2e16f039f09cad439d375
parente417256b835c35a09e0d2d8b58392beb8684e4a1 (diff)
downloadbugzilla-e43d323b6348537adf58d8f1b8b5d1193220f7ac.tar.gz
bugzilla-e43d323b6348537adf58d8f1b8b5d1193220f7ac.tar.xz
Bug 295205 - runtests.pl should check that the line endings of files conform to your OS standard.
Patch by Marc Schumann <wurblzap@gmail.com>. r=LpSolit,mkanat; a=mkanat.
-rw-r--r--t/005whitespace.t20
1 files changed, 18 insertions, 2 deletions
diff --git a/t/005whitespace.t b/t/005whitespace.t
index 75f532956..e6bd07f4e 100644
--- a/t/005whitespace.t
+++ b/t/005whitespace.t
@@ -19,6 +19,8 @@
#
# Contributor(s): Jacob Steenhagen <jake@bugzilla.org>
# David D. Kilzer <ddkilzer@kilzer.net>
+# Colin Ogilvie <mozilla@colinogilvie.co.uk>
+# Marc Schumann <wurblzap@gmail.com>
#
#################
@@ -34,7 +36,7 @@ use Support::Templates;
use File::Spec;
use Test::More tests => ( scalar(@Support::Files::testitems)
- + $Support::Templates::num_actual_files);
+ + $Support::Templates::num_actual_files) * 2;
my @testitems = @Support::Files::testitems;
for my $path (@Support::Templates::include_paths) {
@@ -42,9 +44,12 @@ for my $path (@Support::Templates::include_paths) {
Support::Templates::find_actual_files($path)));
}
+my %results;
+
foreach my $file (@testitems) {
open (FILE, "$file");
- if (grep /\t/, <FILE>) {
+ my @contents = <FILE>;
+ if (grep /\t/, @contents) {
ok(0, "$file contains tabs --WARNING");
} else {
ok(1, "$file has no tabs");
@@ -52,4 +57,15 @@ foreach my $file (@testitems) {
close (FILE);
}
+foreach my $file (@testitems) {
+ open (FILE, "$file");
+ my @contents = <FILE>;
+ if (grep /\r/, @contents) {
+ ok(0, "$file contains non-OS-conformant line endings --WARNING");
+ } else {
+ ok(1, "All line endings of $file are OS conformant");
+ }
+ close (FILE);
+}
+
exit 0;