src/usr.bin/diff/tests, branch releng/13.4FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F13.42024-06-07T21:15:57Zdiff: honour -B flag with -q2024-06-07T21:15:57ZEd Masteemaste@FreeBSD.org2024-05-16T14:53:23Zurn:sha1:12ea2d04c37982cabf7865e8897226c81aae4ab0
PR: 278988
Reviewed by: bapt
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D45220
(cherry picked from commit fb623aab3927a6825ff7731198ec2e33426f7607)
(cherry picked from commit 1b7672ed992963e1c79ccc152f4afd72c91481f3)
Remove $FreeBSD$: one-line sh pattern2023-08-23T17:43:30ZWarner Loshimp@FreeBSD.org2023-08-22T01:32:01Zurn:sha1:023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
diff: tests: loosen up requirements for report_identical2022-04-21T22:38:00ZKyle Evanskevans@FreeBSD.org2022-04-19T04:04:13Zurn:sha1:6182c7881829bc1285a93c24a2a77a9543c5b3a9
This test cannot run without an unprivileged_user being specified
anyways, so just run as the unprivileged user. Revoking read permisions
works just as well if you're guaranteed non-root.
Reviewed by: pstef
Sponsored by: Klara, Inc.
(cherry picked from commit efba49ee5a64f8f56f49e58887484284d785d542)
diff: read whole files to determine if they are ASCII text2021-09-25T08:34:39ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-22T19:57:13Zurn:sha1:bda949b6efdf099846775d3dc595c36561df1cca
Before this change, only the first BUFSIZE bytes were checked.
(cherry picked from commit 3cbf98e2bee91db9ed9118ff557e02cdd449f49a)
diff: don't output carriage returns that were stripped on input2021-09-25T08:34:38ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-22T16:05:59Zurn:sha1:ece58f7ada409ac68e072cdddcc29e21127aafce
--strip-trailing-cr worked as intended for comparison between files,
but the characters were still present in final output.
(cherry picked from commit af2f0164318455433db95adce07af829285b78ad)
diff: Use unprivileged_user with report_identical test2021-08-22T16:48:55ZOlivier Cochardolivier@FreeBSD.org2021-02-03T16:18:59Zurn:sha1:108633bb1556f1e107b05a68fa0c323ac4d2c712
Approved by: bapt
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D28466
(cherry picked from commit b67df8d7c203a139b5afbe72e1947fbb8c32dc73)
diff: add a test case about the non regular file support2021-05-05T08:37:07ZBaptiste Daroussinbapt@FreeBSD.org2021-01-26T10:38:36Zurn:sha1:07d72ca90585ee98dbdd8f4fd2bb01bc2329d99c
(cherry picked from commit c440e7870a020546ad241848e2ff8e9cb27a3073)
diff: add a test case for failed -s option2021-02-01T13:05:24ZBaptiste Daroussinbapt@FreeBSD.org2021-01-25T17:40:12Zurn:sha1:0702bf9c495d517ef30432de1990f9a301598942
(cherry picked from commit 13860e71eb501f498a2263f44ea9244f6830b61c)
diff: honour flags with -q2021-01-09T18:34:06ZEd Masteemaste@FreeBSD.org2021-01-09T16:22:28Zurn:sha1:12a8d3027d414abd15798de1b6d8b01151bdac50
Previously -q (just print a line when files differ) ignored flags like
-w (ignore whitespace). Avoid the D_BRIEF short-circuit when flags are
in effect.
PR: 252515
Reported by: Scott Aitken
Reviewed by: kevans
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D28064
diff: fix side_by_side after r3636792020-07-30T13:33:45ZKyle Evanskevans@FreeBSD.org2020-07-30T13:33:45Zurn:sha1:ac05de17883d6981f9ff3d52154ec336203fc683
It's currently unclear to me how this could have worked previously; \n here
is not a literal newline but actual '\' 'n', and was getting passed to the
underlying regex engine as such. regex(3) does not translate this to a
newline, and this became an error because we don't really allow escaping
of arbitrary ordinary characters anymore.
Run the pattern strings through printf to make sure we're dealing with real
newlines before passing them through to atf_check, which ultimately feeds
them directly to regcomp(3).
This fix is different than that will be needed for sed, in that this is the
proper way to inject newlines into search strings as long as regex(3)
won't combine \ + n as folks might expect.
Reported by: Jenkins via lwhsu
MFC after: 1 week