[src/trunk]: src/tests/util/grep Make tests operate in environments without /...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/912dd282f72b
branches:  trunk
changeset: 755599:912dd282f72b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Jun 10 23:49:48 2010 +0000

description:
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.

diffstat:

 tests/util/grep/Makefile         |    5 +-
 tests/util/grep/d_basic.out      |  139 +++++---------------------------------
 tests/util/grep/d_file_exp.in    |    2 +
 tests/util/grep/d_file_exp.inout |  119 ---------------------------------
 tests/util/grep/d_file_exp.out   |    6 +
 tests/util/grep/t_grep.sh        |   11 +-
 6 files changed, 36 insertions(+), 246 deletions(-)

diffs (truncated from 340 to 300 lines):

diff -r 5cf880b50f25 -r 912dd282f72b tests/util/grep/Makefile
--- a/tests/util/grep/Makefile  Thu Jun 10 22:41:41 2010 +0000
+++ b/tests/util/grep/Makefile  Thu Jun 10 23:49:48 2010 +0000
@@ -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
diff -r 5cf880b50f25 -r 912dd282f72b tests/util/grep/d_basic.out
--- a/tests/util/grep/d_basic.out       Thu Jun 10 22:41:41 2010 +0000
+++ b/tests/util/grep/d_basic.out       Thu Jun 10 23:49:48 2010 +0000
@@ -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
diff -r 5cf880b50f25 -r 912dd282f72b tests/util/grep/d_file_exp.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/util/grep/d_file_exp.in     Thu Jun 10 23:49:48 2010 +0000
@@ -0,0 +1,2 @@
+-0.[24]0
+0.[35]0
diff -r 5cf880b50f25 -r 912dd282f72b tests/util/grep/d_file_exp.inout
--- a/tests/util/grep/d_file_exp.inout  Thu Jun 10 22:41:41 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-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
diff -r 5cf880b50f25 -r 912dd282f72b tests/util/grep/d_file_exp.out
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/util/grep/d_file_exp.out    Thu Jun 10 23:49:48 2010 +0000
@@ -0,0 +1,6 @@
+-0.50
+-0.40
+-0.30
+-0.20
+0.30