[Nmh-workers] [PATCH] test improvements

[Eric Gillespie]

Stupid CVS, I can't remove a file locally without commit access.
If someone commits this, please cvs rm -f it first.  Any chance
you could switch to something modern?  Savannah supports (or will
soon) Bazaar...

Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.276
diff -a -u -r1.276 ChangeLog
--- ChangeLog   13 Jun 2008 00:11:49 -0000      1.276
+++ ChangeLog   24 Jul 2008 22:10:12 -0000
@@ -1,3 +1,22 @@
+2008-07-24  Eric Gillespie  <address@hidden>
+
+       * test/runtest: cat test-temp-dir only once.  Destroy and create
+       test Mail hierarchy here, so each test has its own independent
+       test data.
+
+       * test/setup-test: Drop needless pushd/popd, which don't exist in
+       sh anyway.  Don't use aclocal, which is part of automake.
+       Don't create Mail hierarchy here (see test/runtest).
+
+       * test/tests/folder/test-create, tests/folder/test-total: Drop
+       unused BINDIR.
+
+       * tests/pick/test-pick: Remove failing no-op test.
+
+       * test/tests/scan/test-scan: Write expected and actual output to
+       files and diff them.  This way, if the output differs, diff
+       provides the FAILing exit code and shows the differences.
+
 2008-06-12  Josh Bressers <address@hidden>
        * man/repl.man, etc/mhl.reply:
        Add an attribution line when replying to messages.
Index: test/runtest
===================================================================
RCS file: /sources/nmh/nmh/test/runtest,v
retrieving revision 1.1
diff -a -u -r1.1 runtest
--- test/runtest        17 Apr 2007 01:02:08 -0000      1.1
+++ test/runtest        24 Jul 2008 22:10:12 -0000
@@ -1,9 +1,28 @@
 #!/bin/sh
 
-export MH=`cat test-temp-dir`/mh_profile
 export MH_TEST_DIR=`cat test-temp-dir`
+export MH=$MH_TEST_DIR/mh_profile
 export PATH=$MH_TEST_DIR/bin:$PATH
 
+# clean old test data
+rm -rf $MH_TEST_DIR/Mail
+# setup test data
+mkdir $MH_TEST_DIR/Mail
+folder -create +inbox > /dev/null
+# create 10 basic messages
+for i in `seq 1 10`;
+do
+    cat > $MH_TEST_DIR/Mail/inbox/$i <<EOF
+From: Test$i <address@hidden>
+To: Some User <address@hidden>
+Date: Fri, 29 Sep 2006 00:00:00
+Subject: Testing message $i
+
+This is message number $i
+EOF
+done
+
+# now run the test
 /bin/sh $1
 
 return_value=$?
Index: test/setup-test
===================================================================
RCS file: /sources/nmh/nmh/test/setup-test,v
retrieving revision 1.1
diff -a -u -r1.1 setup-test
--- test/setup-test     17 Apr 2007 01:02:08 -0000      1.1
+++ test/setup-test     24 Jul 2008 22:10:12 -0000
@@ -3,28 +3,9 @@
 TEMPDIR=`mktemp -d /tmp/nmh-test-XXXXXXXX`
 echo $TEMPDIR > test-temp-dir
 
-pushd ..
-aclocal
-autoheader
-autoconf
+cd ..
+autoheader && autoconf && date > stamp-h.in
 ./configure --prefix=$TEMPDIR --with-locking=fcntl
 make install
 
 echo "Path: $TEMPDIR/Mail" > $TEMPDIR/mh_profile
-mkdir $TEMPDIR/Mail
-
-MH=$TEMPDIR/mh_profile $TEMPDIR/bin/folder -create +inbox
-
-for i in `seq 1 10`;
-do
-    cat > $TEMPDIR/Mail/inbox/$i <<EOF
-From: Test$i <address@hidden>
-To: Some User <address@hidden>
-Date: Fri, 29 Sep 2006 00:00:00
-Subject: Testing message $i
-
-This is message number $i
-EOF
-done
-
-popd
Index: test/tests/folder/test-create
===================================================================
RCS file: /sources/nmh/nmh/test/tests/folder/test-create,v
retrieving revision 1.1
diff -a -u -r1.1 test-create
--- test/tests/folder/test-create       17 Apr 2007 01:02:08 -0000      1.1
+++ test/tests/folder/test-create       24 Jul 2008 22:10:12 -0000
@@ -5,9 +5,6 @@
 #
 ######################################################
 
-BINDIR=$MH_TEST_DIR/bin
-
-
 folder -create +testfolder > /dev/null
 if [ ! -d "$MH_TEST_DIR/Mail/testfolder" ]; then
     exit 1
Index: test/tests/folder/test-total
===================================================================
RCS file: /sources/nmh/nmh/test/tests/folder/test-total,v
retrieving revision 1.1
diff -a -u -r1.1 test-total
--- test/tests/folder/test-total        17 Apr 2007 01:02:08 -0000      1.1
+++ test/tests/folder/test-total        24 Jul 2008 22:10:12 -0000
@@ -5,9 +5,6 @@
 #
 ######################################################
 
-BINDIR=$MH_TEST_DIR/bin
-
-
 output=`folder -total +inbox`
 if test x"$output" != x'TOTAL = 10 messages in 1 folder.' ; then
     exit 1
Index: test/tests/scan/test-scan
===================================================================
RCS file: /sources/nmh/nmh/test/tests/scan/test-scan,v
retrieving revision 1.1
diff -a -u -r1.1 test-scan
--- test/tests/scan/test-scan   17 Apr 2007 01:02:08 -0000      1.1
+++ test/tests/scan/test-scan   24 Jul 2008 22:10:12 -0000
@@ -1,18 +1,21 @@
 #!/bin/sh
 
-expected_text="   1  09/29*Test1              Testing message 1<<This is 
message number 1 >>
-   2  09/29*Test2              Testing message 2<<This is message number 2 >>
-   3  09/29*Test3              Testing message 3<<This is message number 3 >>
-   4  09/29*Test4              Testing message 4<<This is message number 4 >>
-   5  09/29*Test5              Testing message 5<<This is message number 5 >>
-   6  09/29*Test6              Testing message 6<<This is message number 6 >>
-   7  09/29*Test7              Testing message 7<<This is message number 7 >>
-   8  09/29*Test8              Testing message 8<<This is message number 8 >>
-   9  09/29*Test9              Testing message 9<<This is message number 9 >>
-  10  09/29*Test10             Testing message 10<<This is message number 10 
>>"
+expected=$MH_TEST_DIR/$$.expected
+actual=$MH_TEST_DIR/$$.actual
 
-output=`scan -width 80 +inbox`
+cat > $expected <<EOF
+   1  09/29 Test1              Testing message 1<<This is message number 1 >>
+   2  09/29 Test2              Testing message 2<<This is message number 2 >>
+   3  09/29 Test3              Testing message 3<<This is message number 3 >>
+   4  09/29 Test4              Testing message 4<<This is message number 4 >>
+   5  09/29 Test5              Testing message 5<<This is message number 5 >>
+   6  09/29 Test6              Testing message 6<<This is message number 6 >>
+   7  09/29 Test7              Testing message 7<<This is message number 7 >>
+   8  09/29 Test8              Testing message 8<<This is message number 8 >>
+   9  09/29 Test9              Testing message 9<<This is message number 9 >>
+  10  09/29 Test10             Testing message 10<<This is message number 10 >>
+EOF
 
-if test x"$output" != x"$expected_text" ; then
-    exit 1
-fi
+scan -width 80 +inbox > $actual
+
+diff -u $expected $actual
Index: uip/Makefile.in
===================================================================
RCS file: /sources/nmh/nmh/uip/Makefile.in,v
retrieving revision 1.22
diff -a -u -r1.22 Makefile.in
--- uip/Makefile.in     24 Dec 2005 17:17:38 -0000      1.22
+++ uip/Makefile.in     24 Jul 2008 22:10:12 -0000
@@ -60,7 +60,7 @@
 # commands to build
 CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \
        mhlist mhmail mhn mhparam mhpath mhshow mhstore msgchk \
-       msh packf pick prompter refile repl rmf rmm scan send show \
+       msh new packf pick prompter refile repl rmf rmm scan send show \
        sortm whatnow whom
 
 ## removed this from CMDS until I can fix it
@@ -83,7 +83,7 @@
        mhbuildsbr.c mhcachesbr.c mhfree.c mhl.c mhlist.c mhlistsbr.c     \
        mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c   \
        mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c     \
-       msgchk.c msh.c mshcmds.c packf.c pick.c picksbr.c popi.c popsbr.c \
+       msgchk.c msh.c mshcmds.c new.c packf.c pick.c picksbr.c popi.c popsbr.c 
\
        post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c         \
        refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c     \
        sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c     \
@@ -183,6 +183,9 @@
 msh: msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o termsbr.o 
$(LOCALLIBS)
        $(LINK) msh.o mshcmds.o vmhsbr.o picksbr.o scansbr.o dropsbr.o mhlsbr.o 
termsbr.o $(LINKLIBS) $(TERMLIB)
 
+new: new.o $(LOCALLIBS)
+       $(LINK) new.o $(LINKLIBS)
+
 packf: packf.o dropsbr.o $(LOCALLIBS)
        $(LINK) packf.o dropsbr.o $(LINKLIBS)
 
@@ -265,11 +268,17 @@
 install-lcmds:
        rm -f $(DESTDIR)$(bindir)/flists
        rm -f $(DESTDIR)$(bindir)/folders
+       rm -f $(DESTDIR)$(bindir)/fn
+       rm -f $(DESTDIR)$(bindir)/fp
+       rm -f $(DESTDIR)$(bindir)/unseen
        rm -f $(DESTDIR)$(bindir)/prev
        rm -f $(DESTDIR)$(bindir)/next
        rm -f $(DESTDIR)$(libdir)/install-mh
        $(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
        $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fn
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/fp
+       $(LN) $(DESTDIR)$(bindir)/new    $(DESTDIR)$(bindir)/unseen
        $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
        $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/next