src/usr.bin/diff/tests/Makefile, branch releng/14.0

Remove $FreeBSD$: one-line sh pattern

2023-08-16T17:55:03Z

Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

diff: fix side-by-side output with tabbed input

2022-12-14T01:31:21Z

The previous logic conflated some things... in this block: - j: input characters rendered so far - nc: number of characters in the line - col: columns rendered so far - hw: column width ((h)ard (w)idth?) Comparing j to hw or col to nc are naturally wrong, as col and hw are limits on their respective counters and nc is already brought down to hw if the input line should be truncated to start with. Right now, we end up easily truncating lines with tabs in them as we count each tab for $tabwidth lines in the input line, but we really should only be accounting for them in the column count. The problem is most easily demonstrated by the two input files added for the tests, the two tabbed lines lose at least a word or two even though there's plenty of space left in the row for each side. Reviewed by: bapt, pstef Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37676

diff: Detect Objective-C methods

2022-02-18T15:09:57Z

When searching back for function definitions, consider lines starting with '+' and '-', this allows us to pick up Objective-C methods as well as C style function definitions. Reviewed by: bapt Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34202

diff: don't output carriage returns that were stripped on input

2021-08-23T05:04:28Z

--strip-trailing-cr worked as intended for comparison between files, but the characters were still present in final output.

diff(1): Implement -B/--ignore-blank-lines

2018-08-19T03:57:20Z

As noted by cem in r338035, coccinelle invokes diff(1) with the -B flag. This was not previously implemented here, so one was forced to create a link for GNU diff to /usr/local/bin/diff Implement the -B flag and add some primitive tests for it. It is implemented in the same fashion that -I is implemented; each chunk's lines are scanned, and if a non-blank line is encountered then the chunk will be output. Otherwise, it's skipped. MFC after: 2 weeks

Use more flexible expression for replacing t_diff in

2017-07-19T18:30:16Z

contrib/netbsd-tests/usr.bin/diff/t_diff.sh with the name of the script via `basename $0`. This was a change I forgot to port over from ^/head/gnu/usr.bin/diff/tests/Makefile@r272787.

Implement a basic --changed-group-format

2017-04-20T14:22:33Z

etcupdate(8) requires that option, while GNU diff supports many more variation of that options, their behaviour beside the simple verion implemented here are quite inconsistent as such I do not plan to implement those. The only special keyword supported by this implementation are: %< and %> %= is not implemented as the documentation of GNU diff says: common lines, but it actually when tested print the changes from the first file

Add a regression test for diff -D

2017-04-20T11:32:18Z

diff: Show nanoseconds in -u/-c header line.

2017-03-26T19:47:43Z

Show nanoseconds in the -u/-c header line. The present portability conditionals cannot handle the POSIX standard st_mtim, so remove them and unconditionally use st_mtim. PR: 218018 Reported by: jbeich Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D10145

diff: Fix mtime of file1 in -u/-c header line.

2017-03-26T14:09:25Z

PR: 218018 Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D10140