Module Name: src
Committed By: jruoho
Date: Sun Mar 11 18:36:01 UTC 2012
Modified Files:
src/tests/usr.bin/awk: Makefile t_awk.sh
Added Files:
src/tests/usr.bin/awk: d_assign_NF.awk d_assign_NF.in d_assign_NF.out
d_big_regexp.awk d_big_regexp.in d_big_regexp.out d_end1.awk
d_end1.in d_end1.out d_end2.awk d_end2.in d_end2.out d_period.awk
d_period.in d_period.out d_string1.awk d_string1.out d_tolower.awk
d_tolower.in d_tolower.out d_toupper.awk d_toupper.in d_toupper.out
Log Message:
Move the existing tests from util/awk to usr.bin/awk.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/awk/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/awk/d_assign_NF.awk \
src/tests/usr.bin/awk/d_assign_NF.in \
src/tests/usr.bin/awk/d_assign_NF.out \
src/tests/usr.bin/awk/d_big_regexp.awk \
src/tests/usr.bin/awk/d_big_regexp.in \
src/tests/usr.bin/awk/d_big_regexp.out src/tests/usr.bin/awk/d_end1.awk \
src/tests/usr.bin/awk/d_end1.in src/tests/usr.bin/awk/d_end1.out \
src/tests/usr.bin/awk/d_end2.awk src/tests/usr.bin/awk/d_end2.in \
src/tests/usr.bin/awk/d_end2.out src/tests/usr.bin/awk/d_period.awk \
src/tests/usr.bin/awk/d_period.in src/tests/usr.bin/awk/d_period.out \
src/tests/usr.bin/awk/d_string1.awk src/tests/usr.bin/awk/d_string1.out \
src/tests/usr.bin/awk/d_tolower.awk src/tests/usr.bin/awk/d_tolower.in \
src/tests/usr.bin/awk/d_tolower.out src/tests/usr.bin/awk/d_toupper.awk \
src/tests/usr.bin/awk/d_toupper.in src/tests/usr.bin/awk/d_toupper.out
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/awk/t_awk.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/awk/Makefile
diff -u src/tests/usr.bin/awk/Makefile:1.1 src/tests/usr.bin/awk/Makefile:1.2
--- src/tests/usr.bin/awk/Makefile:1.1 Sat Mar 10 19:08:56 2012
+++ src/tests/usr.bin/awk/Makefile Sun Mar 11 18:35:59 2012
@@ -1,9 +1,34 @@
-# $NetBSD: Makefile,v 1.1 2012/03/10 19:08:56 christos Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/11 18:35:59 jruoho Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/awk
-
TESTS_SH= t_awk
+NOMAN= # defined
+
+FILESDIR= ${TESTSDIR}
+FILES= d_big_regexp.awk
+FILES+= d_big_regexp.in
+FILES+= d_big_regexp.out
+FILES+= d_end1.awk
+FILES+= d_end1.in
+FILES+= d_end1.out
+FILES+= d_end2.awk
+FILES+= d_end2.in
+FILES+= d_end2.out
+FILES+= d_period.awk
+FILES+= d_period.in
+FILES+= d_period.out
+FILES+= d_string1.awk
+FILES+= d_string1.out
+FILES+= d_tolower.awk
+FILES+= d_tolower.in
+FILES+= d_tolower.out
+FILES+= d_toupper.awk
+FILES+= d_toupper.in
+FILES+= d_toupper.out
+FILES+= d_assign_NF.awk
+FILES+= d_assign_NF.in
+FILES+= d_assign_NF.out
-.include <bsd.test.mk>
+.include <bsd.test.mk>
\ No newline at end of file
Index: src/tests/usr.bin/awk/t_awk.sh
diff -u src/tests/usr.bin/awk/t_awk.sh:1.2 src/tests/usr.bin/awk/t_awk.sh:1.3
--- src/tests/usr.bin/awk/t_awk.sh:1.2 Sat Mar 10 19:19:24 2012
+++ src/tests/usr.bin/awk/t_awk.sh Sun Mar 11 18:36:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.2 2012/03/10 19:19:24 christos Exp $
+# $NetBSD: t_awk.sh,v 1.3 2012/03/11 18:36:01 jruoho Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,6 +30,89 @@
awk=awk
+h_check()
+{
+ local fname=d_$1
+ for sfx in in out awk; do
+ cp -r $(atf_get_srcdir)/$fname.$sfx .
+ done
+ shift 1
+ atf_check -o file:$fname.out -x "awk $@ -f $fname.awk < $fname.in"
+}
+
+atf_test_case big_regexp
+
+big_regexp_head() {
+ atf_set "descr" "Checks matching long regular expressions (PR/33392)"
+}
+
+big_regexp_body() {
+ h_check big_regexp
+}
+
+atf_test_case end
+
+end_head() {
+ atf_set "descr" "Checks that the last line of the input" \
+ "is available under END pattern (PR/29659)"
+}
+
+end_body() {
+ h_check end1
+ h_check end2
+}
+
+atf_test_case string1
+
+string1_head() {
+ atf_set "descr" "Checks escaping newlines in string literals"
+}
+
+string1_body() {
+ for sfx in out awk; do
+ cp -r $(atf_get_srcdir)/d_string1.$sfx .
+ done
+ atf_check -o file:d_string1.out awk -f d_string1.awk
+}
+
+atf_test_case multibyte
+
+multibyte_head() {
+ atf_set "descr" "Checks multibyte charsets support" \
+ "in tolower and toupper (PR/36394)"
+}
+
+multibyte_body() {
+ export LANG=en_US.UTF-8
+
+ h_check tolower
+ h_check toupper
+}
+
+atf_test_case period
+
+period_head() {
+ atf_set "descr" "Checks that the period character is recognised" \
+ "in awk program regardless of locale (bin/42320)"
+}
+
+period_body() {
+ export LANG=ru_RU.KOI8-R
+
+ atf_expect_fail "PR bin/42320"
+ h_check period -v x=0.5
+}
+
+atf_test_case assign_NF
+
+assign_NF_head() {
+ atf_set "descr" 'Checks that assign to NF changes $0 and $n (PR/44063)'
+}
+
+assign_NF_body() {
+ h_check assign_NF
+}
+
atf_test_case single_char_rs
single_char_rs_head() {
@@ -254,6 +337,14 @@ newline_rs_body() {
}
atf_init_test_cases() {
+
+ atf_add_test_case big_regexp
+ atf_add_test_case end
+ atf_add_test_case string1
+ atf_add_test_case multibyte
+ atf_add_test_case period
+ atf_add_test_case assign_NF
+
atf_add_test_case single_char_rs
atf_add_test_case two_char_rs
atf_add_test_case single_char_regex_group_rs
Added files:
Index: src/tests/usr.bin/awk/d_assign_NF.awk
diff -u /dev/null src/tests/usr.bin/awk/d_assign_NF.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_assign_NF.awk Sun Mar 11 18:35:59 2012
@@ -0,0 +1,16 @@
+# $NetBSD: d_assign_NF.awk,v 1.1 2012/03/11 18:35:59 jruoho Exp $
+
+{
+ NF = 2
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+ NF = 3
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+ NF = 4
+ print "$0=`" $0 "`"
+ print "$3=`" $3 "`"
+ print "$4=`" $4 "`"
+}
Index: src/tests/usr.bin/awk/d_assign_NF.in
diff -u /dev/null src/tests/usr.bin/awk/d_assign_NF.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_assign_NF.in Sun Mar 11 18:35:59 2012
@@ -0,0 +1 @@
+ 1 2 3
Index: src/tests/usr.bin/awk/d_assign_NF.out
diff -u /dev/null src/tests/usr.bin/awk/d_assign_NF.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_assign_NF.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1,9 @@
+$0=`1 2`
+$3=``
+$4=``
+$0=`1 2 `
+$3=``
+$4=``
+$0=`1 2 `
+$3=``
+$4=``
Index: src/tests/usr.bin/awk/d_big_regexp.awk
diff -u /dev/null src/tests/usr.bin/awk/d_big_regexp.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_big_regexp.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1,3 @@
+# $NetBSD: d_big_regexp.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+/^[^_][^ ]*_NNIFO([ ]+[^_]+[^ ]*_(CC|INR|JJFO|JJMA|JJPG|NNIFG|NNIFO|NNIMPG|NNIMR|NNING|PP3FD|PQINO|PQMO|PSFR|RQ|TC|VIIR3|VPIPN|VPLIPF|NOTAG|RQR))*$/
Index: src/tests/usr.bin/awk/d_big_regexp.in
diff -u /dev/null src/tests/usr.bin/awk/d_big_regexp.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_big_regexp.in Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+1_NNIFO 1_PSFR 1_JJFO 1_NNIFO 1_INR 1_NNIMR 1_CC 1_NNING 1_RQ 1_VPLIPF 1_NNIFG 1_JJPG 1_NNIMPG 1_PQINO 1_VPIPN 1_PP3FD 1_JJMA 1_PQMO 1_TC 1_VIIR3
Index: src/tests/usr.bin/awk/d_big_regexp.out
diff -u /dev/null src/tests/usr.bin/awk/d_big_regexp.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_big_regexp.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+1_NNIFO 1_PSFR 1_JJFO 1_NNIFO 1_INR 1_NNIMR 1_CC 1_NNING 1_RQ 1_VPLIPF 1_NNIFG 1_JJPG 1_NNIMPG 1_PQINO 1_VPIPN 1_PP3FD 1_JJMA 1_PQMO 1_TC 1_VIIR3
Index: src/tests/usr.bin/awk/d_end1.awk
diff -u /dev/null src/tests/usr.bin/awk/d_end1.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end1.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1,5 @@
+# $NetBSD: d_end1.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+ print NF;
+}
Index: src/tests/usr.bin/awk/d_end1.in
diff -u /dev/null src/tests/usr.bin/awk/d_end1.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end1.in Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+a b c d
Index: src/tests/usr.bin/awk/d_end1.out
diff -u /dev/null src/tests/usr.bin/awk/d_end1.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end1.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+4
Index: src/tests/usr.bin/awk/d_end2.awk
diff -u /dev/null src/tests/usr.bin/awk/d_end2.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end2.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1,5 @@
+# $NetBSD: d_end2.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+ print $0;
+}
Index: src/tests/usr.bin/awk/d_end2.in
diff -u /dev/null src/tests/usr.bin/awk/d_end2.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end2.in Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+a b c d
Index: src/tests/usr.bin/awk/d_end2.out
diff -u /dev/null src/tests/usr.bin/awk/d_end2.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_end2.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+a b c d
Index: src/tests/usr.bin/awk/d_period.awk
diff -u /dev/null src/tests/usr.bin/awk/d_period.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_period.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+{print x + $1 + 0.125}
Index: src/tests/usr.bin/awk/d_period.in
diff -u /dev/null src/tests/usr.bin/awk/d_period.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_period.in Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+0,25
Index: src/tests/usr.bin/awk/d_period.out
diff -u /dev/null src/tests/usr.bin/awk/d_period.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_period.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+0,875
Index: src/tests/usr.bin/awk/d_string1.awk
diff -u /dev/null src/tests/usr.bin/awk/d_string1.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_string1.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1,7 @@
+# $NetBSD: d_string1.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+BEGIN {
+ print "A\
+B";
+ print "CD"
+}
Index: src/tests/usr.bin/awk/d_string1.out
diff -u /dev/null src/tests/usr.bin/awk/d_string1.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_string1.out Sun Mar 11 18:36:00 2012
@@ -0,0 +1,2 @@
+AB
+CD
Index: src/tests/usr.bin/awk/d_tolower.awk
diff -u /dev/null src/tests/usr.bin/awk/d_tolower.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_tolower.awk Sun Mar 11 18:36:00 2012
@@ -0,0 +1,5 @@
+# $NetBSD: d_tolower.awk,v 1.1 2012/03/11 18:36:00 jruoho Exp $
+
+END {
+ print tolower($0);
+}
Index: src/tests/usr.bin/awk/d_tolower.in
diff -u /dev/null src/tests/usr.bin/awk/d_tolower.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_tolower.in Sun Mar 11 18:36:00 2012
@@ -0,0 +1 @@
+ABCÆØÅ
Index: src/tests/usr.bin/awk/d_tolower.out
diff -u /dev/null src/tests/usr.bin/awk/d_tolower.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_tolower.out Sun Mar 11 18:36:01 2012
@@ -0,0 +1 @@
+abcæøå
Index: src/tests/usr.bin/awk/d_toupper.awk
diff -u /dev/null src/tests/usr.bin/awk/d_toupper.awk:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_toupper.awk Sun Mar 11 18:36:01 2012
@@ -0,0 +1,5 @@
+# $NetBSD: d_toupper.awk,v 1.1 2012/03/11 18:36:01 jruoho Exp $
+
+END {
+ print toupper($0);
+}
Index: src/tests/usr.bin/awk/d_toupper.in
diff -u /dev/null src/tests/usr.bin/awk/d_toupper.in:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_toupper.in Sun Mar 11 18:36:01 2012
@@ -0,0 +1 @@
+abcæøå
Index: src/tests/usr.bin/awk/d_toupper.out
diff -u /dev/null src/tests/usr.bin/awk/d_toupper.out:1.1
--- /dev/null Sun Mar 11 18:36:01 2012
+++ src/tests/usr.bin/awk/d_toupper.out Sun Mar 11 18:36:01 2012
@@ -0,0 +1 @@
+ABCÆØÅ
