updaste for NIST85

* DEPENDENCIES: added perl for running NIST85
* tests/cobol85:
	* summary.pl: compute total duration and modules executed, output those to stderr at the end; close file handles
	* Makefile.am (summary.out): new target depending on summary.log
	* Makefile.am (summary.log): catch stderr of summary.pl into summary.out  file and output that on stdout
	* Makefile.am (URL_NEWCOB_Z): replaced by web archive URL

Author: sf-mensch

ChangeLog

@@ -1,4 +1,8 @@
 
+2024-09-27  Simon Sobisch <[email protected]>
+
+	* DEPENDENCIES: added perl for running NIST85
+
 2024-09-09  Simon Sobisch <[email protected]>
 
 	* README: add documentation for "make checkmanual"

DEPENDENCIES

@@ -151,6 +151,14 @@ The following libraries ARE required WHEN :
    utf8 source encoding needs an implementation of the iconv API.
 
 
+6) The NIST COBOL85 testsuite sould be used for verification;
+   the test runner "make test" REQUIRES:
+
+  o Perl >= 5.0005  - https://www.perl.org
+
+    Perl is licensed under its Artistic License, or the GNU General Public License (GPL). 
+
+
 See HACKING if you wish to hack the GnuCOBOL source or build directly
 from version control as this includes the list of additional tools
 necessary for this task.

DEPENDENCIES.md

@@ -131,3 +131,12 @@ If this is not provided by libc, it is provided by:
 *   [libiconv](https://www.gnu.org/software/libiconv/)
 
     GNU libiconv is distributed under GNU Lesser General Public License.
+
+
+NIST COBOL85 testsuite
+----------------------------
+To be able to run `make test`:
+
+*   [Perl](https://www.perl.org) >= 5.0005
+
+    Perl is licensed under its Artistic License, or the GNU General Public License (GPL). 

tests/cobol85/ChangeLog

@@ -1,7 +1,12 @@
 
-2024-08-27  Nicolas Berthier <[email protected]>
+2024-09-27  Simon Sobisch <[email protected]>
 
-	* Makefile.am: stop downloading "newcob.val.Z" from out-dated URL
+	* summary.pl: compute total duration and modules executed,
+	  output those to stderr at the end; close file handles
+	* Makefile.am (summary.out): new target depending on summary.log
+	* Makefile.am (summary.log): catch stderr of summary.pl into
+	  summary.out file and output that on stdout
+	* Makefile.am (URL_NEWCOB_Z): replaced by web archive URL
 
 2023-06-02  Simon Sobisch <[email protected]>
 
@@ -61,7 +66,7 @@
 
 2020-11-21  Simon Sobisch <[email protected]>
 
-	* Makefil.module.in: don't pass additional params to atlocal
+	* Makefile.module.in: don't pass additional params to atlocal
 	* report.pl: now exporting at_group for more useful valgrind log names
 
 2020-10-16  Simon Sobisch <[email protected]>
@@ -400,7 +405,7 @@
 	* SQ.txt, summary.txt : We now pass the LINAGE tests
 
 
-Copyright 2005-2010,2015-2020,2022-2023 Free Software Foundation, Inc.
+Copyright 2005-2010,2015-2020,2022-2024 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification, are
 permitted provided the copyright notice and this notice are preserved.

tests/cobol85/Makefile.am

@@ -1,7 +1,7 @@
 #
 # Makefile gnucobol/tests/cobol85
 #
-# Copyright (C) 2002-2012, 2015-2023 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012, 2015-2024 Free Software Foundation, Inc.
 # Written by Keisuke Nishida, Roger While, Simon Sobisch
 #
 # This file is part of GnuCOBOL.
@@ -24,22 +24,28 @@
 
 RM = rm -rf
 
-MODULES_ALL = NC SM IC SQ RL ST SG OB IF RW DB IX DBNOIX CM
+MODULES_ALL = NC SQ IX IF ST IC RL SM SG OB DB DBNOIX RW CM
 
 # currently untested modules: CM
+# note: MODULES should be kept in order to not change the order
+#       in the summary files;
+#       MODULES_RUN is kept in descending order of runtime duration
+#       to allow faster builds with multiple jobs
 if COB_MAKE_IX
 MODULES = NC SM IC SQ RL ST SG OB IF RW DB IX
-MODULES_RUN = NC_RUN SM_RUN IC_RUN SQ_RUN RL_RUN \
-	ST_RUN SG_RUN OB_RUN IF_RUN RW_RUN DB_RUN IX_RUN
+MODULES_RUN = NC_RUN SQ_RUN IX_RUN IF_RUN ST_RUN \
+	IC_RUN RL_RUN SM_RUN SG_RUN OB_RUN DB_RUN RW_RUN
 SUMMARY = summary.txt
 else
 MODULES = NC SM IC SQ RL ST SG OB IF RW DBNOIX
-MODULES_RUN = NC_RUN SM_RUN IC_RUN SQ_RUN RL_RUN \
-	ST_RUN SG_RUN OB_RUN IF_RUN RW_RUN DBNOIX_RUN
+MODULES_RUN = NC_RUN SQ_RUN IX_RUN IF_RUN ST_RUN \
+	IC_RUN RL_RUN SM_RUN SG_RUN OB_RUN DBNOIX_RUN RW_RUN
 SUMMARY = summarynoix.txt
 endif
 
-URL_NEWCOB_Z = https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z
+# currently down, leading to se<rver error with HTTPS, broken redirection on HTTP
+#URL_NEWCOB_Z = https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z
+URL_NEWCOB_Z = https://web.archive.org/web/20240322143655if_/https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z
 URL_NEWCOB_TAR_GZ = https://gnucobol.sourceforge.io/files/newcob.val.tar.gz
 
 EXTRA_DIST = EXEC85.conf.in expand.pl report.pl summary.pl summary.txt \
@@ -146,9 +152,12 @@ test-local-compat:
 # FIXME: as some make implementations don't support .PHONY (POSIX 2021)
 # and we don't need it: add all depdencies below (MODULES -> report.txt)
 # then remove the rm of the file below
-summary.log:
+summary.log: duration.log
 	@echo "Computing total test results..."
-	@$(PERL) "$(srcdir)/summary.pl" $(MODULES) > $@
+	@$(PERL) "$(srcdir)/summary.pl" $(MODULES) 1> $@ 2>summary.out
+	@cat summary.out
+
+summary.out: summary.log
 
 diff:
 	@echo "Comparing test results for each module"
@@ -169,13 +178,11 @@ diff-summary:
 	@diff $(DIFF_FLAGS) "$(srcdir)/$(SUMMARY)" "summary.log"
 	@echo Done
 
-# Note: $(URL_NEWCOB_Z) is out-dated and simply grabs an HTML file
-# without error.
-# newcob.val.Z:
-# 	@echo "Trying to download newcob.val.Z..."
-#	@(which curl 1>/dev/null && curl $(CURL_FLAGS) "$(URL_NEWCOB_Z)" -o $@) || \
-#	 wget $(WGET_FLAGS) "$(URL_NEWCOB_Z)" || \
-#	 ($(RM) $@; echo "Downloading $@ failed"; false)
+newcob.val.Z:
+	@echo "Trying to download newcob.val.Z..."
+	@(which curl 1>/dev/null && curl $(CURL_FLAGS) "$(URL_NEWCOB_Z)" -o $@) || \
+	 wget $(WGET_FLAGS) "$(URL_NEWCOB_Z)" || \
+	 ($(RM) $@; echo "Downloading $@ failed"; false)
 
 newcob.val.tar.gz:
 	@echo "Trying to download newcob.val.tar.gz..."

tests/cobol85/summary.pl

@@ -1,7 +1,7 @@
 #
 # gnucobol/tests/cobol85/summary.pl
 #
-# Copyright (C) 2002-2012, 2017, 2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012, 2017, 2020, 2024 Free Software Foundation, Inc.
 # Written by Keisuke Nishida, Roger While, Simon Sobisch
 #
 # This file is part of GnuCOBOL.
@@ -35,23 +35,27 @@
 my $total_insp = 0;
 my $total_total = 0;
 
+my $duration = 0;
+my $tested_modules = "";
+
 print ("------ Directory Information -------   --- Total Tests Information ---\n");
 print ("Module Programs Executed Error Crash   Pass Fail Deleted Inspect Total\n");
 print ("------ -------- -------- ----- -----  ----- ---- ------- ------- -----\n");
 
 my $module;
 while ($module = shift) {
-	open(IN, "$module/report.txt") or die;
-        my $test;
-        my $pass;
-        my $fail;
-        my $delete;
-        my $inspect;
-        my $progs;
-        my $executed;
-        my $error;
-        my $crash;
 
+    my $test;
+    my $pass;
+    my $fail;
+    my $delete;
+    my $inspect;
+    my $progs;
+    my $executed;
+    my $error;
+    my $crash;
+
+	open(IN, "$module/report.txt") or die;
 	while (<IN>) {
 		if (/^Total *(\d+) *(\d+) *(\d+) *(\d+) *(\d+)/) {
 			($test, $pass, $fail, $delete, $inspect) = ($1, $2, $3, $4, $5);
@@ -65,6 +69,8 @@
 			$crash = $1;
 		}
 	}
+	close(IN);
+
 	printf "%-6s %8d %8d %5d %5d   %4d %4d %7d %7d %5d\n",
 	$module, $progs, $executed, $error, $crash,
 	$pass, $fail, $delete, $inspect, $test;
@@ -77,10 +83,24 @@
 	$total_del += $delete;
 	$total_insp += $inspect;
 	$total_total += $test;
+
+	$tested_modules = "$tested_modules$module ";
+
+	open(IN, "$module/duration.txt") or die;
+	while (<IN>) {
+		if (/^Total *([\d.,]+)/) {
+            $duration += $1;
+            last;  # Exit the loop once 'Total' is found
+		}
+	}
+	close(IN);
 }
 
 print ("------ -------- -------- ----- -----  ----- ---- ------- ------- -----\n");
 printf "Total  %8d %8d %5d %5d  %5d %4d %7d %7d %5d\n",
     $total_progs, $total_executed, $total_error, $total_crash,
     $total_pass, $total_fail, $total_del, $total_insp, $total_total;
-print STDERR "Total executed programs : $total_executed - Total performed tests : $total_total\n\n";
+
+print STDERR "Total executed programs : $total_executed - Total performed tests : $total_total\n";
+print STDERR "Modules tested : $tested_modules\n";
+print STDERR "Total duration : $duration seconds\n\n";