src/usr.bin/diff/tests, branch release/13.1.0

diff: read whole files to determine if they are ASCII text

2021-09-25T08:34:39Z

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 input

2021-09-25T08:34:38Z

--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 test

2021-08-22T16:48:55Z

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 support

2021-05-05T08:37:07Z

(cherry picked from commit c440e7870a020546ad241848e2ff8e9cb27a3073)

diff: add a test case for failed -s option

2021-02-01T13:05:24Z

(cherry picked from commit 13860e71eb501f498a2263f44ea9244f6830b61c)

diff: honour flags with -q

2021-01-09T18:34:06Z

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 r363679

2020-07-30T13:33:45Z

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

diff: restore compatibility with GNU diff regarding -N option

2020-06-01T09:09:36Z

When -N is used the missing files are treated as empty. PR: 233402 Submitted by: Fehmi Noyan Isi Reported by: Roman Neuhauser MFC after: 3 days Differential Revision: D25081

Restore compatibility with GNU diff regarding --label

2020-06-01T09:01:13Z

Various options to "diff(1)" show filenames, and traditionally make use of the "--label" parameter, if set. Restore this behaviour in BSD diff. While here add a regression test PR: 244533 Submitted by: Jamie Landeg-Jones MFC after: 3 days

diff(1): don't reject specifying the same format multiple times

2020-04-28T14:33:33Z

This may happen, for instance, if one happens to have an alias of diff to diff -up and attempts to specify the amount of context on top of that. Aliases like this may cause other problems, but if they're really not ever generating non-unified diffs then we should at least not break that use-case. In addition, we'll now pick up a format mismatch if -p is specified with !contextual && !unified && !unset. Fix up a small trailing whitespace nit in the tests while we're here, and add tests to make sure that we can double up all the formatting options. Reported by: jbeich MFC after: 3 days