On Alpine Linux 3.14 the build works fine, but there is one test failure:
FAIL: contrib/gdiffmk/tests/runtests.sh
Find attached the log file. The cause is apparently that the 'diff' program
on this platform is not GNU diff, but diff from BusyBox. See:
$ diff --version
diff: unrecognized option: version
BusyBox v1.33.1 () multi-call binary.
Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2
Compare files line by line and output the differences between them.
This implementation supports unified diffs only.
-a Treat all files as text
-b Ignore changes in the amount of whitespace
-B Ignore changes whose lines are all blank
-d Try hard to find a smaller set of changes
-i Ignore case differences
-L Use LABEL instead of the filename in the unified header
-N Treat absent files as empty
-q Output only whether files differ
-r Recurse
--no-dereference Don't follow symlinks
-S Start with FILE when comparing directories
-T Make tabs line up by prefixing a tab when necessary
-s Report when two files are the same
-t Expand tabs to spaces in output
-U Output LINES lines of context
-w Ignore all whitespace
===========================================
GNU roff 1.23.0.rc3: ./test-suite.log
===========================================
# TOTAL: 159
# PASS: 151
# SKIP: 5
# XFAIL: 2
# FAIL: 1
# XPASS: 0
# ERROR: 0
.. contents:: :depth: 2
FAIL: contrib/gdiffmk/tests/runtests.sh
=======================================
./contrib/gdiffmk/tests/result.1 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline
+++ ./contrib/gdiffmk/tests/result.1
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.2 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline
+++ ./contrib/gdiffmk/tests/result.2
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.3 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline
+++ ./contrib/gdiffmk/tests/result.3
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.4 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline
+++ ./contrib/gdiffmk/tests/result.4
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.5 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline
+++ ./contrib/gdiffmk/tests/result.5
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.6 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.6
+++ ./contrib/gdiffmk/tests/result.6
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc C
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc A
-file2 only
-.mc
-file1 and file2 #3
-.mc D
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.6a TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.6a
+++ ./contrib/gdiffmk/tests/result.6a
@@ -1,17 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc C
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc A
-file2 only
-.mc
-file1 and file2 #3
-.mc D
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.7 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.7
+++ ./contrib/gdiffmk/tests/result.7
@@ -1,2 +1,36 @@
-gdiffmk: The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk: './contrib/gdiffmk/tests/tmp_file.7', and it would be overwritten.
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.8 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.8
+++ ./contrib/gdiffmk/tests/result.8
@@ -1,26 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-[[
-file1 only
-]]
-.br
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-[[
-file1 only
-file1 only
-]]
-.br
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.9 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.9
+++ ./contrib/gdiffmk/tests/result.9
@@ -1,26 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-<<<<
-file1 only
->>>>
-.br
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-<<<<
-file1 only
-file1 only
->>>>
-.br
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.9a TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.9a
+++ ./contrib/gdiffmk/tests/result.9a
@@ -1,26 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-<<<<
-file1 only
->>>>
-.br
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-<<<<
-file1 only
-file1 only
->>>>
-.br
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
./contrib/gdiffmk/tests/result.10 TEST FAILED
--- ../contrib/gdiffmk/tests/baseline.10
+++ ./contrib/gdiffmk/tests/result.10
@@ -1,26 +1,36 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-[[
-file1 only
-]]
-.
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-[[
-file1 only
-file1 only
-]]
-.
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5
+gdiffmk: The 'diff' program does not accept the required '-Dname' option.
+Use GNU diff instead. See the '-x DIFFCMD' option. You can also
+install GNU diff as gdiff on your system
+
+Usage: gdiffmk [ OPTIONS ] FILE1 FILE2 [ OUTPUT ]
+Place difference marks into the new version of a groff/nroff/troff document.
+FILE1 and FILE2 are compared, using 'diff', and FILE2 is output with
+groff '.mc' requests added to indicate how it is different from FILE1.
+
+ FILE1 Previous version of the groff file. '-' means standard input.
+ FILE2 Current version of the groff file. '-' means standard input.
+ Either FILE1 or FILE2 can be standard input, but not both.
+ OUTPUT Copy of FILE2 with '.mc' commands added.
+ '-' means standard output (the default).
+ If the shell's 'test' does not support option -ef, OUTPUT
+ can only be the standard output.
+
+OPTIONS:
+ -a ADDMARK Mark for added groff source lines. Default: '+'.
+ -c CHANGEMARK Mark for changed groff source lines. Default: '|'.
+ -d DELETEMARK Mark for deleted groff source lines. Default: '*'.
+
+ -D Show the deleted portions from changed and deleted text.
+ Default delimiting marks: '[[' .... ']]'.
+ -B By default, the deleted texts marked by the '-D' option end
+ with an added troff '.br' command. This option prevents
+ the added '.br'.
+ -M MARK1 MARK2 Change the delimiting marks for the '-D' option.
+
+ -x DIFFCMD Use a different diff(1) command;
+ one that accepts the '-Dname' option, such as GNU diff.
+ -s SEDCMD Use a different sed(1) command;
+ such as GNU sed.
+ --version Print version information on the standard output and exit.
+ --help Print this message on the standard error.
+
failure_count 12
FAIL contrib/gdiffmk/tests/runtests.sh (exit status: 1)
SKIP: contrib/hdtbl/examples/test-hdtbl.sh
==========================================
ghostscript program missing, can't check hdtbl examples
SKIP contrib/hdtbl/examples/test-hdtbl.sh (exit status: 77)
SKIP: src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh
==================================================================
checking "ascii" output device...group1 group2 group3 " \ ` ' - ^ ~
checking "latin1" output device...group1 group2 group3 " \ ` ' - ^ ~
../src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh: line 124: locale: not found
SKIP src/devices/grotty/tests/basic_latin_glyphs_map_correctly.sh (exit status: 77)
SKIP: src/preproc/preconv/tests/smoke-test.sh
=============================================
testing -e flag override of BOM detection
testing detection of UTF-32BE BOM
testing detection of UTF-32LE BOM
testing detection of UTF-16BE BOM
testing detection of UTF-16LE BOM
testing detection of UTF-8 BOM
testing detection of Emacs coding tag in piped input
testing uchardet detection of encoding
SKIP src/preproc/preconv/tests/smoke-test.sh (exit status: 77)
XFAIL: src/roff/groff/tests/string_case_xform_unicode_escape.sh
===============================================================
XFAIL src/roff/groff/tests/string_case_xform_unicode_escape.sh (exit status: 1)
XFAIL: tmac/tests/e_footnotes-work-with-columns.sh
==================================================
e.tmac:<standard input>:5: changing columnation with footnote pending
e.tmac:<standard input>:7: writing 2-column footnote in 1-column layout
XFAIL tmac/tests/e_footnotes-work-with-columns.sh (exit status: 1)
SKIP: tmac/tests/pdfpic_does-not-choke-on-bad-pdfinfo-output.sh
===============================================================
cannot locate 'gs' command
SKIP tmac/tests/pdfpic_does-not-choke-on-bad-pdfinfo-output.sh (exit status: 77)
SKIP: tmac/tests/pdfpic_falls-back-to-PSPIC.sh
==============================================
cannot locate 'gs' command
SKIP tmac/tests/pdfpic_falls-back-to-PSPIC.sh (exit status: 77)