gawk-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] gawk branch, master, updated. gawk-4.1.0-5370-gfe8a6dc9


From: Arnold Robbins
Subject: [SCM] gawk branch, master, updated. gawk-4.1.0-5370-gfe8a6dc9
Date: Mon, 9 Oct 2023 11:45:06 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  fe8a6dc96fa2db3682ef304dabdaed1f9c1ff2ef (commit)
      from  c6890f3f72574ec748f5332ca2bbcb5f355209f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=fe8a6dc96fa2db3682ef304dabdaed1f9c1ff2ef

commit fe8a6dc96fa2db3682ef304dabdaed1f9c1ff2ef
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Mon Oct 9 18:44:36 2023 +0300

    Fix cmdlinefsbacknl2.sh for MacOS.

diff --git a/test/ChangeLog b/test/ChangeLog
index 3bd65be6..84417d4f 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+       * cmdlinefsbacknl2.sh: Add sed commands after all the od
+       commands to fix up whitespace so that the test passes
+       on MacOS.
+
 2023-10-08         Arnold D. Robbins     <arnold@skeeve.com>
 
        * cmdlinefsbacknl2.sh: Add -v BINMODE=2 to gawk invocation
diff --git a/test/cmdlinefsbacknl2.sh b/test/cmdlinefsbacknl2.sh
index 3a6308af..55cacce1 100755
--- a/test/cmdlinefsbacknl2.sh
+++ b/test/cmdlinefsbacknl2.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 awk="$AWK -v BINMODE=2"
+SED="sed -e '/^\$/d' -e 's/[   ][      ]*/ /g' -e 's/  *\$//'"
 
 # Both of these succeeded:
 # export LC_CTYPE=C
@@ -10,9 +11,9 @@ export LC_CTYPE="en_US.UTF-8"
 # Test terminal backslash handling. Each test should produce "5c 0a"
 # (a backslash followed by a newline). Presently, master produces "0a".
 #
-$awk -F'\' 'BEGIN { print FS }' | od -An -tx1
-$awk -v s='\' 'BEGIN { print s }' | od -An -tx1
-echo | $awk '{ print s }' s='\' | od -An -tx1
+$awk -F'\' 'BEGIN { print FS }' | od -An -tx1 | eval $SED
+$awk -v s='\' 'BEGIN { print s }' | od -An -tx1 | eval $SED
+echo | $awk '{ print s }' s='\' | od -An -tx1 | eval $SED
 
 
 # These are the same terminal backslash handling tests we just ran, but
@@ -22,11 +23,11 @@ echo | $awk '{ print s }' s='\' | od -An -tx1
 # produces only "0a". The backslash is lost.
 #
 $awk -F'\
-\' 'BEGIN { print FS }' | od -An -tx1
+\' 'BEGIN { print FS }' | od -An -tx1 | eval $SED
 $awk -v s='\
-\' 'BEGIN { print s }' | od -An -tx1
+\' 'BEGIN { print s }' | od -An -tx1 | eval $SED
 echo | $awk '{ print s }' s='\
-\' | od -An -tx1
+\' | od -An -tx1 | eval $SED
 
 
 # \uffffffff (-1)
@@ -42,7 +43,7 @@ echo | $awk '{ print s }' s='\
 $awk 'BEGIN {
        print "\uFFFFFFFF"      # "?\n"
        print "\uFFFFFFFE"      # "?\n"
-}' | od -An -tx1               # 3f 0a 3f 0a
+}' | od -An -tx1 | eval $SED   # 3f 0a 3f 0a
 
 
 # Again, a negative return value causes confusion, this time producing a

-----------------------------------------------------------------------

Summary of changes:
 test/ChangeLog           |  6 ++++++
 test/cmdlinefsbacknl2.sh | 15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
gawk



reply via email to

[Prev in Thread] Current Thread [Next in Thread]