All xml-diff errors should be fatal.

[xml-template] / tests / xml-diff.pl

diff --git a/tests/xml-diff.pl b/tests/xml-diff.pl
index 22b828ae4f14782770f3de60feb28411a616b38a..eed51b40c153a23a5956a24e4aca0e8fca02d414 100644 (file)
--- a/tests/xml-diff.pl
+++ b/tests/xml-diff.pl
@@ -69,8 +69,14 @@ sub compare {
                $d1 =~ s/\s+$//;
                $d2 =~ s/\s+$//;
 
+               # compress other whitespace
+               $d1 =~ s/\n/ /g;
+               $d1 =~ s/ +/ /g;
+               $d2 =~ s/\n/ /g;
+               $d2 =~ s/ +/ /g;
+
                if ($d1 ne $d2) {
-                       print STDERR "$nsuri1/$lname1 has differing textual content\n";
+                       print STDERR "$nsuri1/$lname1 has differing textual content ('$d1' vs. '$d2')\n";
                        exit(1);
                }
        }
@@ -136,11 +142,12 @@ sub compare_attr_list {
 
                if (!defined($attr2_found)) {
                        print STDERR "Attribute $nsuri1/$lname1 exists on one side but not the other\n";
-                       last;
+                       exit(1);
                }
 
                if ($attr1->getValue ne $attr2_found->getValue) {
                        print STDERR "Attribute $nsuri1/$lname1 has differing values\n";
+                       exit(1);
                }
        }
 }