[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-3008-g6834342

[John Malmberg]

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, gawk-4.2-stable has been updated
       via  683434295fd98f5fdc134a9b8a32a51f0597f6f9 (commit)
      from  02e8aa7f237791e13b1431f70df14fa3a3404bc2 (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=683434295fd98f5fdc134a9b8a32a51f0597f6f9

commit 683434295fd98f5fdc134a9b8a32a51f0597f6f9
Author: John Malmberg <address@hidden>
Date:   Tue Aug 7 22:08:51 2018 -0500

    VMS test fixes.

diff --git a/vms/ChangeLog b/vms/ChangeLog
index be8d0e6..52b1433 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-07         John E. Malmberg      <address@hidden>
+
+       * vmstest.com: Fixes for back89, gsubtst5, and fsbs
+
 2018-08-03         John E. Malmberg      <address@hidden>
 
        * generate_config_vms_h_gawk.com:
diff --git a/vms/vmstest.com b/vms/vmstest.com
index eb95f39..fb94395 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -95,6 +95,7 @@ $     def_dir = f$environment("default")
 $      create/dir 'def_dir'
 $      listdepth = 0
 $      pipeok = 0
+$       prepend_error = 0
 $      floatmode = -1  ! 0: D_float, 1: G_float, 2: IEEE T_float
 $
 $      list = p1+" "+p2+" "+p3+" "+p4+" "+p5+" "+p6+" "+p7+" "+p8
@@ -397,7 +398,6 @@ $funstack:
 $getline4:
 $getnr2tb:
 $getnr2tm:
-$gsubtst5:
 $gsubtst7:
 $gsubtst8:
 $hex2:
@@ -441,6 +441,12 @@ $  test_class = "basic"
 $       test_in = "''test'.in"
 $      goto common_with_test_in_redir
 $!
+$gsubtst5:
+$      test_class = "basic"
+$       test_in = "''test'.in"
+$       prepend_error = 1
+$      goto common_with_test_in_redir
+$!
 $sprintfc:
 $      test_class = "charset_tests"
 $       test_in = "''test'.in"
@@ -493,9 +499,18 @@ $  if f$search("sys$disk:[]_''test'.tmp;*") .nes. ""
 $      then
 $          delete sys$disk:[]_'test'.tmp;*
 $      endif
+$       if prepend_error .eq. 1
+$       then
+$           tmp_error = "_''test'.tmp"
+$           tmp_output = "_''test'.tmp2"
+$       else
+$           tmp_error = "_''test'.tmp2"
+$           tmp_output = "_''test'.tmp"
+$       endif
+$       prepend_error = 0
 $       set noOn
-$       define/user sys$error _'test'.tmp2
-$      gawk -f 'test'.awk < 'test_in' >_'test'.tmp
+$       define/user sys$error 'tmp_error'
+$      gawk -f 'test'.awk < 'test_in' >'tmp_output'
 $      gawk_status = $status
 $      set On
 $      if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
@@ -1225,7 +1240,7 @@ $ return
 $
 $fsbs:         echo "fsbs"
 $      test_class = "basic"
-$      gawk -v "FS=\" "{ print $1, $2 }" fsbs.in >_fsbs.tmp
+$      gawk -f fsbs.awk fsbs.in >_fsbs.tmp
 $      if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
 $      then
 $          delete sys$disk:[]_'test'.tmp;2
@@ -1936,22 +1951,11 @@ $           gosub junit_report_fail_diff
 $      endif
 $      return
 $
-$back89:               echo "back89"
+$back89:               ! echo "back89"
 $      test_class = "basic"
-$      gawk "/a\8b/" back89.in >_back89.tmp
-$      if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
-$      then
-$          delete sys$disk:[]_'test'.tmp;2
-$      endif
-$      cmp back89.ok sys$disk:[]_back89.tmp
-$      if $status
-$      then
-$          rm _back89.tmp;
-$          gosub junit_report_pass
-$      else
-$          gosub junit_report_fail_diff
-$      endif
-$      return
+$       test_in = "''test'.in"
+$       prepend_error = 1
+$      goto common_with_test_in_redir
 $
 $tradanch:     echo "tradanch"
 $      test_class = "basic"

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

Summary of changes:
 vms/ChangeLog   |  4 ++++
 vms/vmstest.com | 42 +++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
gawk