summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2016-04-24 15:18:22 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2016-04-24 15:18:29 +0200
commit331f4a638150c1ab8ae5bea86b901f32263b9192 (patch)
tree9c230d68703861322b8252e5d2191b24ef650766
parent8e2e252932faf3320f72a0b62136c4606e09ebc3 (diff)
downloademacs-331f4a638150c1ab8ae5bea86b901f32263b9192.tar.gz
Encode the shr tests files with trailing white space
-rw-r--r--.gitattributes3
-rw-r--r--test/data/shr/li-empty.txt6
-rw-r--r--test/lisp/net/shr-tests.el3
3 files changed, 6 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 24fe4c7acfa..13e58a87e9f 100644
--- 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 8320bc0097b..906fd8df8b3 100644
--- 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 6606ec58151..ab6fc93d1a0 100644
--- 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 ()