diff options
author | Andrew Gallant <jamslam@gmail.com> | 2020-11-02 10:37:49 -0500 |
---|---|---|
committer | Andrew Gallant <jamslam@gmail.com> | 2020-11-02 10:52:51 -0500 |
commit | 2819212f8997fbea813fdfed1e8c6bd62674dd23 (patch) | |
tree | 55459edec977b27f1e7c888a4fba678fc248e0a1 /tests | |
parent | 810be0b348b9e9070705329df40c1d182f6645f1 (diff) |
printer: tweak binary detection message format
This roughly matches similar changes made in GNU grep recently.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/binary.rs | 16 | ||||
-rw-r--r-- | tests/misc.rs | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/binary.rs b/tests/binary.rs index 89914165..d93712eb 100644 --- a/tests/binary.rs +++ b/tests/binary.rs @@ -40,7 +40,7 @@ rgtest!(after_match1_implicit, |dir: Dir, mut cmd: TestCommand| { let expected = "\ hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle -WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741) +hay: WARNING: stopped searching binary file after match (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -53,7 +53,7 @@ rgtest!(after_match1_explicit, |dir: Dir, mut cmd: TestCommand| { let expected = "\ 1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle -Binary file matches (found \"\\0\" byte around offset 9741) +binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -64,7 +64,7 @@ rgtest!(after_match1_stdin, |_: Dir, mut cmd: TestCommand| { let expected = "\ 1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle -Binary file matches (found \"\\0\" byte around offset 9741) +binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.pipe(HAY)); }); @@ -85,7 +85,7 @@ rgtest!(after_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| { let expected = "\ hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle -Binary file hay matches (found \"\\0\" byte around offset 9741) +hay: binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -200,7 +200,7 @@ rgtest!(after_match2_implicit, |dir: Dir, mut cmd: TestCommand| { let expected = "\ hay:1:The Project Gutenberg EBook of A Study In Scarlet, by Arthur Conan Doyle -WARNING: stopped searching binary file hay after match (found \"\\0\" byte around offset 9741) +hay: WARNING: stopped searching binary file after match (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -240,7 +240,7 @@ rgtest!(before_match1_explicit, |dir: Dir, mut cmd: TestCommand| { cmd.args(&["--no-mmap", "-n", "Heaven", "hay"]); let expected = "\ -Binary file matches (found \"\\0\" byte around offset 9741) +binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -253,7 +253,7 @@ rgtest!(before_match1_implicit_binary, |dir: Dir, mut cmd: TestCommand| { cmd.args(&["--no-mmap", "-n", "--binary", "Heaven", "-g", "hay"]); let expected = "\ -Binary file hay matches (found \"\\0\" byte around offset 9741) +hay: binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); @@ -288,7 +288,7 @@ rgtest!(before_match2_explicit, |dir: Dir, mut cmd: TestCommand| { cmd.args(&["--no-mmap", "-n", "a medical student", "hay"]); let expected = "\ -Binary file matches (found \"\\0\" byte around offset 9741) +binary file matches (found \"\\0\" byte around offset 9741) "; eqnice!(expected, cmd.stdout()); }); diff --git a/tests/misc.rs b/tests/misc.rs index a61be0b5..c892da5b 100644 --- a/tests/misc.rs +++ b/tests/misc.rs @@ -788,7 +788,7 @@ rgtest!(unrestricted3, |dir: Dir, mut cmd: TestCommand| { cmd.arg("-uuu").arg("foo"); let expected = "\ -Binary file hay matches (found \"\\0\" byte around offset 3) +hay: binary file matches (found \"\\0\" byte around offset 3) "; eqnice!(expected, cmd.stdout()); }); @@ -1001,7 +1001,7 @@ rgtest!(binary_convert, |dir: Dir, mut cmd: TestCommand| { cmd.arg("--no-mmap").arg("foo").arg("file"); let expected = "\ -Binary file matches (found \"\\0\" byte around offset 3) +binary file matches (found \"\\0\" byte around offset 3) "; eqnice!(expected, cmd.stdout()); }); @@ -1011,7 +1011,7 @@ rgtest!(binary_convert_mmap, |dir: Dir, mut cmd: TestCommand| { cmd.arg("--mmap").arg("foo").arg("file"); let expected = "\ -Binary file matches (found \"\\0\" byte around offset 3) +binary file matches (found \"\\0\" byte around offset 3) "; eqnice!(expected, cmd.stdout()); }); |