[gawk-diffs] [SCM] gawk branch, feature/improve-tests, updated. gawk-4.1.0-3073-gc8d12ad

[Arnold Robbins]

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, feature/improve-tests has been updated
       via  c8d12ad71d24384c7331ae5e36997b2665012362 (commit)
      from  b7c669ad18ada830cea83c8c57222e908bba1ab2 (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=c8d12ad71d24384c7331ae5e36997b2665012362

commit c8d12ad71d24384c7331ae5e36997b2665012362
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Apr 16 21:50:57 2018 +0300

    Further improvements in generating pc/Makefile.tst.

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 3358e6a..728c131 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-15         Arnold D. Robbins     <address@hidden>
 
+       * GenMakefileTst.awk: Further improve processing of input file.
+
+2018-04-15         Arnold D. Robbins     <address@hidden>
+
        * GenMakefileTst.awk: Improve processing of input file.
 
 2018-04-12         Arnold D. Robbins     <address@hidden>
diff --git a/pc/GenMakefileTst.awk b/pc/GenMakefileTst.awk
index 78e3adf..a273a88 100644
--- a/pc/GenMakefileTst.awk
+++ b/pc/GenMakefileTst.awk
@@ -110,16 +110,22 @@ function print_recipe(            i, start)
                print "address@hidden Expect $@ to fail on MinGW"
        }
 
-       # Print all the lines but the last
-       for (i = start; i < line; i++)
-               print recipe_lines[i]
+       # find first line from the end that starts with @
+       # make sure it starts with @-
+       for (i = line; i >= start; i--) {
+               if (recipe_lines[i] !~ /^\t@/)
+                       continue
+
+               if (recipe_lines[i] ~ /address@hidden/)
+                       break
+               else if (recipe_lines[i] ~ /^\t@/) {
+                       recipe_lines[i] = "address@hidden" 
substr(recipe_lines[i], 3)
+                       break;
+               }
+       }
 
-       # Make sure last line starts with @- so that make will keep going
-       if (recipe_lines[i] ~ /address@hidden/)
-               print recipe_lines[i]
-       else if (recipe_lines[i] ~ /^\t@/)
-               printf "address@hidden", substr(recipe_lines[i], 3)
-       else
+       # Print all the lines but the last
+       for (i = start; i <= line; i++)
                print recipe_lines[i]
 }
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 3943ff2..b7b1c45 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -3,6 +3,8 @@
        * Gentests: Remove VMS stuff. It hasn't been used in years.
        * Gentests.vms: Removed.
        * Makefile.am (EXTRA_DIST): Remove Gentests.vms.
+       (regtest): Add an echo $@ and make last line start with @,
+       for consistency with other tests.
 
 2018-04-12         Arnold D. Robbins     <address@hidden>
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 87eaff9..d2cb111 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1578,10 +1578,11 @@ argarray::
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 regtest::
+       @echo $@
        @echo 'Some of the output from regtest is very system specific, do not'
        @echo 'be distressed if your output differs from that distributed.'
        @echo 'Manual inspection is called for.'
-       AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
+       @AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
 
 manyfiles::
        @echo $@
diff --git a/test/Makefile.in b/test/Makefile.in
index 1b76f3d..bdcf6b4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2022,10 +2022,11 @@ argarray::
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
 regtest::
+       @echo $@
        @echo 'Some of the output from regtest is very system specific, do not'
        @echo 'be distressed if your output differs from that distributed.'
        @echo 'Manual inspection is called for.'
-       AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
+       @AWK=$(AWKPROG) "$(srcdir)"/regtest.sh
 
 manyfiles::
        @echo $@

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

Summary of changes:
 pc/ChangeLog          |  4 ++++
 pc/GenMakefileTst.awk | 24 +++++++++++++++---------
 test/ChangeLog        |  2 ++
 test/Makefile.am      |  3 ++-
 test/Makefile.in      |  3 ++-
 5 files changed, 25 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
gawk