GraphicsMagick: utilities/tests/convert.tap: Use sed to count fi...

GraphicsMagick Commits <[email protected]>
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.38334.1639527521.1346.graphicsmagick-commit@lists.sourceforge.net>
changeset e10a315d4eb4 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e10a315d4eb4
summary: utilities/tests/convert.tap: Use sed to count file lines rather than wc since wc output is inconsistent

diffstat:

 ChangeLog                   |  6 ++++++
 magick/version.h            |  2 +-
 utilities/tests/convert.tap |  2 +-
 www/Changelog.html          |  5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r ab38f2d6f433 -r e10a315d4eb4 ChangeLog
--- a/ChangeLog	Sun Dec 12 15:19:43 2021 -0600
+++ b/ChangeLog	Tue Dec 14 18:18:10 2021 -0600
@@ -1,3 +1,9 @@
+2021-12-14  Bob Friesenhahn  <[email protected]>
+
+        * utilities/tests/convert.tap: Use sed to count file lines rather
+        than wc since wc output is inconsistent.  Fixes SourceForge issue
+        #657 "Convert test fails in 1.3.37".
+
 2021-12-12  Bob Friesenhahn  <[email protected]>
 
         * version.sh: Update shared library versioning information for
diff -r ab38f2d6f433 -r e10a315d4eb4 magick/version.h
--- a/magick/version.h	Sun Dec 12 15:19:43 2021 -0600
+++ b/magick/version.h	Tue Dec 14 18:18:10 2021 -0600
@@ -38,7 +38,7 @@
 #define MagickLibVersion  0x262300
 #define MagickLibVersionText  "1.3.37"
 #define MagickLibVersionNumber 26,23,0
-#define MagickChangeDate   "20211212"
+#define MagickChangeDate   "20211214"
 #define MagickReleaseDate  "2021-12-12"
 
 /*
diff -r ab38f2d6f433 -r e10a315d4eb4 utilities/tests/convert.tap
--- a/utilities/tests/convert.tap	Sun Dec 12 15:19:43 2021 -0600
+++ b/utilities/tests/convert.tap	Tue Dec 14 18:18:10 2021 -0600
@@ -8,7 +8,7 @@
 commands=${top_srcdir}/utilities/tests/convert-cmds.txt
 
 # Count how many commands there are
-count=`wc -l ${commands} | sed -e 's/ .*//'`
+count=`sed -n '$=' ${commands}`
 
 # Number of tests we plan to execute
 test_plan_fn ${count}
diff -r ab38f2d6f433 -r e10a315d4eb4 www/Changelog.html
--- a/www/Changelog.html	Sun Dec 12 15:19:43 2021 -0600
+++ b/www/Changelog.html	Tue Dec 14 18:18:10 2021 -0600
@@ -35,6 +35,11 @@
 <div class="document">
 
 
+<p>2021-12-14  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+* utilities/tests/convert.tap: Use sed to count file lines rather
+than wc since wc output is inconsistent.  Fixes SourceForge issue
+#657 &quot;Convert test fails in 1.3.37&quot;.</blockquote>
 <p>2021-12-12  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <p>* version.sh: Update shared library versioning information for
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.