From: Tobias Geerinckx-Rice Date: Thu, 16 Aug 2018 21:12:30 +0200 Subject: extundelete: Fix build with e2fsprogs 1.44. The ‘inode.i_file_acl’ field was replaced with ‘inode.i_size_high’. I'm not sure the field name is still accurate or useful, so don't print it at all. Based on this[0] patch by ‘conikost’[1]. [0]: https://sourceforge.net/p/extundelete/tickets/5/ [1]: https://sourceforge.net/u/conikost --- a/src/insertionops.cc 2012-12-30 18:23:32.000000000 +0100 +++ b/src/insertionops.cc 2018-05-07 22:58:13.065868723 +0200 @@ -33,7 +33,6 @@ os << "File flags: " << inode.i_flags << std::endl; os << "File version (for NFS): " << inode.i_generation << std::endl; os << "File ACL: " << inode.i_file_acl << std::endl; - os << "Directory ACL: " << inode.i_dir_acl << std::endl; os << "Fragment address: " << inode.i_faddr << std::endl; os << "Direct blocks: "; for (int n = 0; n < EXT2_NDIR_BLOCKS; n++) ripts Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/emacs-json-reformat-fix-tests.patch
blob: 977e50fc687d27d7c85d045d5af9dc2c355760e8 (about) (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32

Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>

This patch fixes tests for Emacs 25.

Upstream bug URL:

https://github.com/gongo/json-reformat/issues/33

diff --git a/test/json-reformat-test.el b/test/json-reformat-test.el
index 7de3be1..b4a4dde 100644
--- a/test/json-reformat-test.el
+++ b/test/json-reformat-test.el
@@ -58,7 +58,7 @@
 (ert-deftest json-reformat-test:string-to-string ()
   (should (string= "\"foobar\"" (json-reformat:string-to-string "foobar")))
   (should (string= "\"fo\\\"o\\nbar\"" (json-reformat:string-to-string "fo\"o\nbar")))
-  (should (string= "\"\\u2661\"" (json-reformat:string-to-string "\u2661")))
+  (should (string= "\"♡\"" (json-reformat:string-to-string "\u2661")))
 
   (should (string= "\"^(amq\\\\.gen.*|amq\\\\.default)$\"" (json-reformat:string-to-string "^(amq\\.gen.*|amq\\.default)$")))
   )
@@ -148,6 +148,6 @@ bar\"" (json-reformat:string-to-string "fo\"o\nbar")))
 [{ foo : \"bar\" }, { \"foo\" : \"baz\" }]") ;; At 3 (line)
         (json-reformat-region (point-min) (point-max)))
       (should (string=
-               "JSON parse error [Reason] Bad string format: \"doesn't start with '\\\"'!\" [Position] In buffer, line 3 (char 6)"
+               "JSON parse error [Reason] Bad string format: \"doesn't start with \`\\\"'!\" [Position] In buffer, line 3 (char 6)"
                message-string))
       )))
-- 
2.15.1
generated by cgit