[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, egtests, updated. gawk-4.1.0-4786-g40f70ac3
From: |
Antonio Giovanni Colombo |
Subject: |
[SCM] gawk branch, egtests, updated. gawk-4.1.0-4786-g40f70ac3 |
Date: |
Mon, 15 Jul 2024 14:54:33 -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, egtests has been updated
via 40f70ac37abdf0cb86b08eb48b6906413353c5f5 (commit)
from 771503644b87700e2adbf843bb0f6b1ec2e8dc0a (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=40f70ac37abdf0cb86b08eb48b6906413353c5f5
commit 40f70ac37abdf0cb86b08eb48b6906413353c5f5
Author: Antonio Giovanni Colombo <azc100@gmail.com>
Date: Mon Jul 15 20:53:16 2024 +0200
modification gawktexi.in ===> gawk.texi and other stuff
diff --git a/egtests/ChangeLog b/egtests/ChangeLog
index 250aa66a..b9362af3 100644
--- a/egtests/ChangeLog
+++ b/egtests/ChangeLog
@@ -1,3 +1,11 @@
+2024-07-15 Antonio Giovanni Colombo <azc100@gmail.com>
+ * egtest: Updated.
+ * egtest.awk: Updated.
+ * extracten: Updated.
+ * extractit: Updated.
+ * info.html: Updated.
+ * info.txt: Updated.
+
2022-04-30 Antonio Giovanni Colombo <azc100@gmail.com>
* egtest: Updated for arrayorder.
diff --git a/egtests/egtest b/egtests/egtest
index db62aab9..65401e06 100755
--- a/egtests/egtest
+++ b/egtests/egtest
@@ -7,7 +7,7 @@
#
# it will work only under Linux/Unix
# it will work only when invoked in the distribution directory
-# (that way the location of the gawktexi.in files is known)
+# (that way the location of the gawk.texi files is known)
#
# it can be executed by any user, provided it has access
# to the gawk distribution directories
@@ -220,8 +220,14 @@ do_gen_float_table() {
echo "$vimdiff $tmplib/*.out"
wait_go_ahead
$vimdiff $tmplib/*.out
+}
-
+do_getlocaltime() {
+ echo "*"
+ echo "* Tested by alarm.awk"
+ echo "*"
+ echo "* getlocaltime routine is contained in gettime.awk"
+ do_alarm
}
do_getopt() {
@@ -236,14 +242,6 @@ do_gettime() {
do_alarm
}
-do_getlocaltime() {
- echo "*"
- echo "* Tested by alarm.awk"
- echo "*"
- echo "* getlocaltime routine is contained in gettime.awk"
- do_alarm
-}
-
do_grcat() {
echo "*"
echo "gcc -o $tmplib/grcat ../lib/grcat.c -DHAVE_GETGRENT"
@@ -356,6 +354,7 @@ do_igawk() {
echo "cat cut.awk >> $testpgm"
cat cut.awk >> $testpgm
echo "*"
+ chmod +x igawk.sh
echo "echo abcdefghijklmnopqrstuwwxyz 0123456789 | igawk.sh -f $testpgm
-- -c2-8"
echo abcdefghijklmnopqrstuwwxyz 0123456789 | igawk.sh -f $testpgm
-- -c2-8
}
@@ -456,11 +455,11 @@ do_noassign() {
echo "BEGIN { print \"==>\",a,b,c,\"<==\"; exit }"
echo "BEGIN { print \"==>\",a,b,c,\"<==\"; exit }" > $testpgm
echo "* no assignments"
- echo "gawk -v No_command_assign=1 -v a=1 -v b=2 -v c=3 -f noassign.awk
-f $testpgm"
- gawk -v No_command_assign=1 -v a=1 -v b=2 -v c=3 -f noassign.awk
-f $testpgm
+ echo "gawk -v No_command_assign=1 -f noassign.awk a=1 b=2 c=3 -f
$testpgm"
+ gawk -v No_command_assign=1 -f noassign.awk a=1 b=2 c=3 -f
$testpgm
echo "* use assignments"
- echo "gawk -v No_command_assign=0 -v a=1 -v b=2 -v c=3 -f noassign.awk
-f $testpgm"
- gawk -v No_command_assign=0 -v a=1 -v b=2 -v c=3 -f noassign.awk
-f $testpgm
+ echo "gawk -v No_command_assign=0 -f noassign.awk a=1 b=2 c=3 -f
$testpgm"
+ gawk -v No_command_assign=0 -f noassign.awk a=1 b=2 c=3 -f
$testpgm
}
do_ns_passwd() {
@@ -747,6 +746,9 @@ do_wc() {
echo "cat $testdata"
cat $testdata
echo "*"
+ echo "wc $testdata"
+ wc $testdata
+ echo "*"
echo "gawk -f getopt.awk -f ftrans.awk -f wc.awk -- -c $testdata"
gawk -f getopt.awk -f ftrans.awk -f wc.awk -- -c $testdata
echo "*"
@@ -822,9 +824,9 @@ then
fi
#
-# it must contain the gawktexi.in file
+# it must contain the gawk.texi file
#
-if [ ! -s "$docen/gawktexi.in" ]
+if [ ! -s "$docen/gawk.texi" ]
then
echo Current directory is $PWD
echo This script must be executed in a gawk distribution, in the
directory egtests
@@ -832,7 +834,9 @@ then
exit
fi
+#
# just to play it safe, let us check Italian as well
+#
if [ ! -d "$docit" ]
then
echo Current directory is $PWD
@@ -842,9 +846,9 @@ then
fi
#
-# it must contain the gawktexi.in file
+# it must contain the gawk.texi file
#
-if [ ! -s "$docit/gawktexi.in" ]
+if [ ! -s "$docit/gawk.texi" ]
then
echo Current directory is $PWD
echo This script must be executed in a gawk distribution, in the
directory egtests
@@ -852,7 +856,9 @@ then
exit
fi
+#
# current directory
+#
export b=${PWD}
#
# programs etc. are in this directory
@@ -867,8 +873,9 @@ else
mkdir $s
fi
-# extract both versions, so that all
-# the needed stuff is there
+#
+# extract both versions, so that all the needed stuff is there
+#
. $b/extracten
. $b/extractit
#
@@ -912,9 +919,13 @@ chmod 644 $s/it/eg/data/guide-it.po
# name of a directory used as a work area
#
export tmplib=$s/$lang
+#
# name of a temporary program needed sometimes
+#
export testpgm=$tmplib/testpgm.awk
+#
# name of a temporary datafile needed sometimes
+#
export testdata=$tmplib/testdata.txt
cd $s/$lang/eg
@@ -922,6 +933,7 @@ cd $s/$lang/eg
# prepare the list of tests to perform
#
list=`find . -type f|gawk -f $b/egtest.awk -v s=$s -v lang=$lang|sort`
+#echo $list
#
# working directory during the tests
#
@@ -929,7 +941,7 @@ cd $s/$lang/eg/prog
while [ true ]
do
- # the parameter for scegli is the number of columns
+ # the parameter for choose is the number of columns
# real output is in $s/choice
gawk -f $b/choose.awk -v list="$list" -v cols=4 -v s=$s
choice=`cat $s/choice`
@@ -945,7 +957,9 @@ do
rm -rf $s
exit
fi
+ #
# browse/edit
+ #
if [ "$subcmd" = "b" -o "$subcmd" = "e" ]
then
#echo $sublst
@@ -962,7 +976,9 @@ do
done
continue
fi
+ #
# vimdiff
+ #
if [ "$subcmd" = "d" -a "$sublst" != "" ]
then
#echo $sublst
@@ -980,7 +996,9 @@ do
done
continue
fi
+ #
# where is the program
+ #
if [ "$subcmd" = "w" -a "$sublst" != "" ]
then
for i in $sublst
@@ -1002,6 +1020,7 @@ do
then
continue
fi
+ #
# every other $subcmd does nothing
#echo $sublst
for i in $sublst
diff --git a/egtests/egtest.awk b/egtests/egtest.awk
index 3844bc5f..dd60180d 100755
--- a/egtests/egtest.awk
+++ b/egtests/egtest.awk
@@ -24,6 +24,10 @@ END { print "}" >egi }
# this is not part of the stuff to be tested,
# it has been prepared in advance
if ( wrk ~ "guide-it.po" ) { next }
+ # gen_float_table tests all three programs: .awk .c .py
+ # no need to specify it three times, gen_float_table.awk is enough
+ if ( wrk ~ "gen-float-table.c" ) { next }
+ if ( wrk ~ "gen-float-table.py" ) { next }
nel=split(wrk,el,"/")
if ( nel!=3 ) { next }
wrk=el[3]
diff --git a/egtests/extracten b/egtests/extracten
index a75011da..6b3245c4 100755
--- a/egtests/extracten
+++ b/egtests/extracten
@@ -1,7 +1,7 @@
:
#set -xv
-echo "* Extracting in $s/en from the English gawktexi.in"
+echo "* Extracting in $s/en from the English gawk.texi"
cd $s
if [ ! -d "en" ]
then
@@ -11,7 +11,7 @@ else
mkdir en
fi
cd en
-cp $docen/gawktexi.in gawktexi.en
+cp $docen/gawk.texi gawktexi.en
gawk -f $b/extracten.awk gawktexi.en
cat $s/en/eg/prog/extract.awk $s/en/eg/lib/join.awk >$s/extract.en
diff $b/extracten.awk $s/extract.en
diff --git a/egtests/extractit b/egtests/extractit
index 461417c8..6c713d9c 100755
--- a/egtests/extractit
+++ b/egtests/extractit
@@ -1,7 +1,7 @@
:
#set -xv
-echo "* Extracting in $s/it from the Italian gawktexi.in"
+echo "* Extracting in $s/it from the Italian gawk.texi"
cd $s
if [ ! -d "it" ]
then
@@ -11,7 +11,7 @@ else
mkdir it
fi
cd it
-cp $docit/gawktexi.in gawktexi.it
+cp $docit/gawk.texi gawktexi.it
gawk -f $b/extractit.awk gawktexi.it
cat $s/it/eg/prog/extract.awk $s/it/eg/lib/join.awk >$s/extract.it
diff $b/extractit.awk $s/extract.it
diff --git a/egtests/info.html b/egtests/info.html
index 23f89133..979122cb 100755
--- a/egtests/info.html
+++ b/egtests/info.html
@@ -28,7 +28,7 @@ license of Gawk is implied.
The script should work when executed in the
distribution directory in which it is contained.
-The position of its input (the gawktexi.in files
+The position of its input (the gawk.texi files
that are in the distribution doc and doc/it
directories) is supposed to be at the same level
of the egtests directory, i.e.:
diff --git a/egtests/info.txt b/egtests/info.txt
index e9c9e9db..7cc8b97d 100755
--- a/egtests/info.txt
+++ b/egtests/info.txt
@@ -8,7 +8,7 @@ license of Gawk is implied.
The script should work when executed in the
distribution directory in which it is contained.
-The position of its input (the gawktexi.in files
+The position of its input (the gawk.texi files
that are in the distribution doc and doc/it
directories) is supposed to be at the same level
of the egtests directory, i.e.:
-----------------------------------------------------------------------
Summary of changes:
egtests/ChangeLog | 8 +++++++
egtests/egtest | 61 +++++++++++++++++++++++++++++++++++-------------------
egtests/egtest.awk | 4 ++++
egtests/extracten | 4 ++--
egtests/extractit | 4 ++--
egtests/info.html | 2 +-
egtests/info.txt | 2 +-
7 files changed, 58 insertions(+), 27 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, egtests, updated. gawk-4.1.0-4786-g40f70ac3,
Antonio Giovanni Colombo <=