[SCM] gawk branch, master, updated. gawk-4.1.0-3895-gabb7374

[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, master has been updated
       via  abb73745d2f45437fc98d271d1db089fafc0b6a7 (commit)
      from  4be99b75c7cf84c7b21d3bcb4011f3870a926c4c (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=abb73745d2f45437fc98d271d1db089fafc0b6a7

commit abb73745d2f45437fc98d271d1db089fafc0b6a7
Author: John Malmberg <address@hidden>
Date:   Tue Feb 11 07:47:12 2020 -0600

    Simplify vmstest.com error handling.

diff --git a/vms/ChangeLog b/vms/ChangeLog
index 3327017..f851c16 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-11         John E. Malmberg      <address@hidden>
+
+       * vmstest.com: Simplify test error handling.
+
 2020-02-04         John E. Malmberg      <address@hidden>
 
        * vmstest.com: Fix manyfile test cleanup to handle a search list.
diff --git a/vms/vmstest.com b/vms/vmstest.com
index 952d9f0..3f81175 100644
--- a/vms/vmstest.com
+++ b/vms/vmstest.com
@@ -95,7 +95,6 @@ $     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
@@ -395,6 +394,7 @@ $! common tests, not needing special set up: gawk -f 
'test'.awk 'test'.in
 $addcomma:
 $anchgsub:
 $asgext:
+$back89:
 $backgsub:
 $concat1:
 $datanonl:
@@ -407,6 +407,7 @@ $funstack:
 $getline4:
 $getnr2tb:
 $getnr2tm:
+$gsubtst5:
 $gsubtst7:
 $gsubtst8:
 $hex2:
@@ -450,12 +451,6 @@ $  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"
@@ -500,37 +495,23 @@ $common_with_test_in_redir:
 $! common with 'test'.in redirected.
 $!
 $      echo "''test'"
-$      if f$search("sys$disk:[]_''test'.tmp2;*") .nes. ""
-$      then
-$          delete sys$disk:[]_'test'.tmp2;*
-$      endif
+$!     if f$search("sys$disk:[]_''test'.tmp2;*") .nes. ""
+$!     then
+$!         delete sys$disk:[]_'test'.tmp2;*
+$!     endif
 $      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
+$       tmp_output = "_''test'.tmp"
 $       set noOn
-$       define/user sys$error 'tmp_error'
-$      gawk -f 'test'.awk < 'test_in' >'tmp_output'
+$      gawk -f 'test'.awk < 'test_in' >'tmp_output' 2>&1
 $      gawk_status = $status
 $      set On
 $      if f$search("sys$disk:[]_''test'.tmp;2") .nes. ""
 $      then
 $          delete sys$disk:[]_'test'.tmp;2
 $      endif
-$      if f$search("sys$disk:[]_''test'.tmp2;2") .nes. ""
-$      then
-$          delete sys$disk:[]_'test'.tmp2;2
-$      endif
-$       append _'test'.tmp2 _'test'.tmp
 $      if .not. gawk_status
 $       then
 $          call exit_code 'gawk_status' _'test'.tmp
@@ -538,7 +519,7 @@ $       endif
 $      cmp 'test'.ok sys$disk:[]_'test'.tmp
 $      if $status
 $      then
-$          rm _'test'.tmp;*,_'test'.tmp2;*
+$          rm _'test'.tmp;*
 $          gosub junit_report_pass
 $      else
 $          gosub junit_report_fail_diff
@@ -1978,13 +1959,7 @@ $        else
 $          gosub junit_report_fail_diff
 $      endif
 $      return
-$
-$back89:               ! echo "back89"
-$      test_class = "basic"
-$       test_in = "''test'.in"
-$       prepend_error = 1
-$      goto common_with_test_in_redir
-$
+$!
 $tradanch:     echo "tradanch"
 $      test_class = "basic"
 $      if f$search("tradanch.ok").eqs."" then  create tradanch.ok
@@ -3813,8 +3788,17 @@ $profile5:
 $profile8:
 $      echo "''test'"
 $      test_class = "gawk_ext"
-$       if f$search("_''test'.tmp1") .nes. "" then delete _'test'.tmp1;*
+$       if f$search("sys$disk:[]_''test'.tmp1") .nes. ""
+$       then
+$           delete _'test'.tmp1;*
+$       endif
+$      if f$search("sys$disk:[]_''test'.tmp2;*") .nes. ""
+$      then
+$          delete sys$disk:[]_'test'.tmp2;*
+$      endif
+$       tmp_error = "_''test'.tmp2"
 $      define/user GAWK_NO_PP_RUN 1
+$       define/user sys$error 'tmp_error'
 $       set noOn
 $      gawk --pretty-print=_'test'.tmp1 -f 'test'.awk > _NL:
 $       gawk_status = $status
@@ -3823,6 +3807,11 @@ $        if f$search("sys$disk:[]_''test'.tmp1;2") .nes. 
""
 $      then
 $          delete sys$disk:[]_'test'.tmp1;2
 $      endif
+$      if f$search("sys$disk:[]_''test'.tmp2;2") .nes. ""
+$      then
+$          delete sys$disk:[]_'test'.tmp2;2
+$      endif
+$       append _'test'.tmp2 _'test'.tmp1
 $      convert/fdl=nla0: _'test'.tmp1 sys$disk:[]_'test'.tmp
 $      convert/fdl=nla0: 'test'.ok _'test'.ok
 $      if .not. gawk_status
@@ -3830,6 +3819,8 @@ $       then
 $          call exit_code 'gawk_status' _'test'.tmp
 $       endif
 $      cmp sys$disk:[]_'test'.ok sys$disk:[]_'test'.tmp
+$       cmp_status = $status
+$       if .not. gawk_status then gawk_status = cmp_status
 $      if gawk_status
 $      then
 $          rm _'test'.tmp;*,_'test'.ok;*,_'test'.tmp1;*

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

Summary of changes:
 vms/ChangeLog   |  4 ++++
 vms/vmstest.com | 63 +++++++++++++++++++++++++--------------------------------
 2 files changed, 31 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
gawk