Module Name: src
Committed By: pooka
Date: Thu Jun 10 23:49:49 UTC 2010
Modified Files:
src/tests/util/grep: Makefile d_basic.out t_grep.sh
Added Files:
src/tests/util/grep: d_file_exp.in d_file_exp.out
Removed Files:
src/tests/util/grep: d_file_exp.inout
Log Message:
Make tests operate in environments without /usr/share/dict/words,
such as the one used by "anita test".
This has also the added benefit of decoupling the tests from whataver
is in "words", should that file ever be updated.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/util/grep/Makefile \
src/tests/util/grep/d_basic.out
cvs rdiff -u -r0 -r1.1 src/tests/util/grep/d_file_exp.in \
src/tests/util/grep/d_file_exp.out
cvs rdiff -u -r1.1 -r0 src/tests/util/grep/d_file_exp.inout
cvs rdiff -u -r1.2 -r1.3 src/tests/util/grep/t_grep.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/util/grep/Makefile
diff -u src/tests/util/grep/Makefile:1.1 src/tests/util/grep/Makefile:1.2
--- src/tests/util/grep/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/grep/Makefile Thu Jun 10 23:49:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/10 23:49:48 pooka Exp $
NOMAN= # defined
@@ -23,7 +23,8 @@
FILES+= d_context_c.out
FILES+= d_context_d.out
FILES+= d_egrep.out
-FILES+= d_file_exp.inout
+FILES+= d_file_exp.in
+FILES+= d_file_exp.out
FILES+= d_ignore_case.out
FILES+= d_input
FILES+= d_invert.in
Index: src/tests/util/grep/d_basic.out
diff -u src/tests/util/grep/d_basic.out:1.1 src/tests/util/grep/d_basic.out:1.2
--- src/tests/util/grep/d_basic.out:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/grep/d_basic.out Thu Jun 10 23:49:48 2010
@@ -1,119 +1,20 @@
-aa
-aal
-aalii
-aam
-aardvark
-aardwolf
-Afrikaans
-ahaaina
-Alcaaba
-amaas
-assbaa
-baa
-baahling
-Baal
-baal
-Baalath
-Baalish
-Baalism
-Baalist
-Baalite
-Baalitical
-Baalize
-Baalshem
-baar
-Balaam
-Balaamite
-Balaamitical
-balmacaan
-Bastaard
-bataan
-baviaantje
-bazaar
-berghaan
-Bilaan
-caam
-caama
-caaming
-caapeba
-caatinga
-cabaan
-Canaan
-Canaanite
-Canaanitess
-Canaanitic
-Canaanitish
-chaa
-daalder
-Danaan
-encraal
-enkraal
-golandaas
-Graafian
-haab
-haaf
-heemraad
-Isaac
-Jaalin
-knorhaan
-kraal
-laager
-laang
-Landsmaal
-maam
-maamselle
-macaasim
-malaanonang
-molengraaffite
-mushaa
-naa
-naam
-Naaman
-Naassenes
-nagmaal
-paal
-paar
-paauw
-paraaminobenzoic
-praam
-raad
-raash
-reaal
-Rigsmaal
-Riksmaal
-saa
-Saan
-Saarbrucken
-salaam
-salaamlike
-Sangraal
-saraad
-schaapsteker
-schoolmaam
-schoolmaamish
-Senaah
-shaatnez
-skokiaan
-springhaas
-staab
-Staatsrat
-taa
-Taal
-Taalbond
-taar
-Takhaar
-taysaam
-teewhaap
-tetraamylose
-Transvaal
-Transvaaler
-Transvaalian
-Tzaam
-vaagmer
-vaalite
-Vaalpens
-Waac
-waag
-waapa
-waar
-Waasi
+123
+1123
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+2123
+3123
+4123
+5123
+6123
+7123
+8123
+9123
Index: src/tests/util/grep/t_grep.sh
diff -u src/tests/util/grep/t_grep.sh:1.2 src/tests/util/grep/t_grep.sh:1.3
--- src/tests/util/grep/t_grep.sh:1.2 Fri Jun 4 08:39:41 2010
+++ src/tests/util/grep/t_grep.sh Thu Jun 10 23:49:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_grep.sh,v 1.2 2010/06/04 08:39:41 jmmv Exp $
+# $NetBSD: t_grep.sh,v 1.3 2010/06/10 23:49:48 pooka Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,8 +25,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-words="/usr/share/dict/words"
-
atf_test_case basic
basic_head()
{
@@ -34,7 +32,8 @@
}
basic_body()
{
- atf_check -o file:"$(atf_get_srcdir)/d_basic.out" grep aa "${words}"
+ atf_check -o file:"$(atf_get_srcdir)/d_basic.out" \
+ sh -c 'jot 10000 | grep 123'
}
atf_test_case binary
@@ -170,8 +169,8 @@
}
file_exp_body()
{
- atf_check -o file:"$(atf_get_srcdir)/d_file_exp.inout" \
- grep -f "$(atf_get_srcdir)/d_file_exp.inout" "${words}"
+ atf_check -o file:"$(atf_get_srcdir)/d_file_exp.out" \
+ sh -c 'jot 21 -1 1.00 | grep -f '"$(atf_get_srcdir)"'/d_file_exp.in'
}
atf_test_case egrep
Added files:
Index: src/tests/util/grep/d_file_exp.in
diff -u /dev/null src/tests/util/grep/d_file_exp.in:1.1
--- /dev/null Thu Jun 10 23:49:49 2010
+++ src/tests/util/grep/d_file_exp.in Thu Jun 10 23:49:48 2010
@@ -0,0 +1,2 @@
+-0.[24]0
+0.[35]0
Index: src/tests/util/grep/d_file_exp.out
diff -u /dev/null src/tests/util/grep/d_file_exp.out:1.1
--- /dev/null Thu Jun 10 23:49:49 2010
+++ src/tests/util/grep/d_file_exp.out Thu Jun 10 23:49:48 2010
@@ -0,0 +1,6 @@
+-0.50
+-0.40
+-0.30
+-0.20
+0.30
+0.50
