Changes in Makefile

d0b2dbfa - Remove $FreeBSD$: one-line sh pattern

Wed, 16 Aug 2023 17:55:03 +0000

Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

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

Wed, 14 Dec 2022 01:31:21 +0000

diff: fix side-by-side output with tabbed inputThe 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 arelimits on their respective counters and nc is already brought down to hwif the input line should be truncated to start with.Right now, we end up easily truncating lines with tabs in them as wecount each tab for $tabwidth lines in the input line, but we reallyshould only be accounting for them in the column count. The problem ismost 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'splenty of space left in the row for each side.Reviewed by: bapt, pstefSponsored by: Klara, Inc.Differential Revision: https://reviews.freebsd.org/D37676 List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

8f79bd9b - diff: Detect Objective-C methods

Fri, 18 Feb 2022 15:07:52 +0000

diff: Detect Objective-C methodsWhen searching back for function definitions, consider lines startingwith '+' and '-', this allows us to pick up Objective-C methods as wellas C style function definitions.Reviewed by: baptSponsored by: Klara Inc.Differential Revision: https://reviews.freebsd.org/D34202 List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

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

Sun, 22 Aug 2021 16:05:59 +0000

diff: don't output carriage returns that were stripped on input--strip-trailing-cr worked as intended for comparison between files,but the characters were still present in final output. List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

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

Sun, 19 Aug 2018 03:57:20 +0000

diff(1): Implement -B/--ignore-blank-linesAs 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 linkfor GNU diff to /usr/local/bin/diffImplement the -B flag and add some primitive tests for it. It is implementedin 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 List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

274b460b - Use more flexible expression for replacing t_diff in

Wed, 19 Jul 2017 18:30:16 +0000

Use more flexible expression for replacing t_diff incontrib/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. List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

fddcb7b8 - Implement a basic --changed-group-format

Thu, 20 Apr 2017 14:22:33 +0000

Implement a basic --changed-group-formatetcupdate(8) requires that option, while GNU diff supports many more variationof that options, their behaviour beside the simple verion implemented here arequite 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, butit actually when tested print the changes from the first file List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

05d06eca - Add a regression test for diff -D

Thu, 20 Apr 2017 11:32:18 +0000

Add a regression test for diff -D List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

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

Sun, 26 Mar 2017 19:47:43 +0000

diff: Show nanoseconds in -u/-c header line.Show nanoseconds in the -u/-c header line.The present portability conditionals cannot handle the POSIX standardst_mtim, so remove them and unconditionally use st_mtim.PR: 218018Reported by: jbeichReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D10145 List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

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

Sun, 26 Mar 2017 14:09:25 +0000

diff: Fix mtime of file1 in -u/-c header line.PR: 218018Reviewed by: baptDifferential Revision: https://reviews.freebsd.org/D10140 List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

458cbf0a - Rename tests from to _test to match the FreeBSD test suite

Thu, 23 Mar 2017 03:28:24 +0000

Rename tests from to _test to match the FreeBSD test suitenaming schemeusr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_testto avoid collisions with the renamed FreeBSD test.MFC after: 1 weekSponsored by: Dell EMC Isilon List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

beeed599 - Integrate contrib/netbsd-tests/usr.bin/diff/t_diff.sh in as

Wed, 15 Mar 2017 06:18:14 +0000

Integrate contrib/netbsd-tests/usr.bin/diff/t_diff.sh in as.../usr.bin/diff/diff_testSome minor adjustment needed to be done for :same as it currentlyhas the test script hardcoded into the test, instead of using anidiom like $(dirname $0)MFC after: 1 weekSponsored by: Dell EMC Isilon List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile

3bbe3f67 - Import diff from OpenBSD and remove GNU diff

Sat, 11 Mar 2017 05:01:29 +0000

Import diff from OpenBSD and remove GNU diffSome of the modifications from the previous summer of code has been integratedModification for compatibility with GNU diff output has been addedMain difference with OpenBSD:Implement multiple GNU diff options:* --ignore-file-name-case* --no-ignore-file-name-case* --normal* --tabsize* --strip-trailing-crMake diff -p compatible with GNU diffImplement diff -lMake diff -r compatible with GNU diffCapsicumize diffing 2 regular filesAdd a simple test suiteApproved by: AsiaBSDcon devsummitObtained from: OpenBSD, GSoCRelnotes: yes List of files: /freebsd-14.2/usr.bin/diff/tests/Makefile