Encode the shr tests files with trailing white space

diff --git a/.gitattributes b/.gitattributes
index 24fe4c7acfaac20c9adef508e677c501418b5fcd..13e58a87e9fe38630c764ab1c657ac9c53c8a0bc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -33,9 +33,6 @@ test/etags/html-src/algrthms.html whitespace=cr-at-eol
 # The upstream maintainer does not want to remove trailing whitespace.
 doc/misc/texinfo.tex -whitespace=blank-at-eol
 
-# The shr test files can have trailing whitespace.
-test/data/shr/*.txt -whitespace=blank-at-eol
-
 # Some files should not be treated as text when diffing or merging.
 *.cur binary
 *.gpg binary

diff --git a/test/data/shr/li-empty.txt b/test/data/shr/li-empty.txt
index 8320bc0097be2041dd4f14445bee8a30d112456c..906fd8df8b3e6898f7b3c9d99451e6c9818f02ab 100644 (file)
--- a/test/data/shr/li-empty.txt
+++ b/test/data/shr/li-empty.txt
@@ -1,3 +1,3 @@
-1 
-2 
-3 
+1%20
+2%20
+3%20

diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el
index 6606ec58151dc17cb6fd30650472cd4ea13648df..ab6fc93d1a057cc811e8a82d75aeac3c82a687e7 100644 (file)
--- a/test/lisp/net/shr-tests.el
+++ b/test/lisp/net/shr-tests.el
@@ -36,6 +36,9 @@
       (cons (buffer-substring-no-properties (point-min) (point-max))
             (with-temp-buffer
               (insert-file-contents (format "data/shr/%s.txt" name))
+              (while (re-search-forward "%\\([0-9A-F][0-9A-F]\\)" nil t)
+                (replace-match (string (string-to-number (match-string 1) 16))
+                               t t))
               (buffer-string))))))
 
 (ert-deftest rendering ()