[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nmh-commits] nmh ChangeLog test/runtest test/setup-test test...
From: |
Josh Bressers |
Subject: |
[Nmh-commits] nmh ChangeLog test/runtest test/setup-test test... |
Date: |
Fri, 25 Jul 2008 00:11:55 +0000 |
CVSROOT: /sources/nmh
Module name: nmh
Changes by: Josh Bressers <bress> 08/07/25 00:11:55
Modified files:
. : ChangeLog
test : runtest setup-test
test/tests/folder: test-create test-total
test/tests/scan: test-scan
Removed files:
test/tests/pick: test-pick
Log message:
* 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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.276&r2=1.277
http://cvs.savannah.gnu.org/viewcvs/nmh/test/runtest?cvsroot=nmh&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/nmh/test/setup-test?cvsroot=nmh&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/nmh/test/tests/folder/test-create?cvsroot=nmh&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/nmh/test/tests/folder/test-total?cvsroot=nmh&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/nmh/test/tests/pick/test-pick?cvsroot=nmh&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/nmh/test/tests/scan/test-scan?cvsroot=nmh&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- ChangeLog 13 Jun 2008 00:11:49 -0000 1.276
+++ ChangeLog 25 Jul 2008 00:11:53 -0000 1.277
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/runtest 17 Apr 2007 01:02:08 -0000 1.1
+++ test/runtest 25 Jul 2008 00:11:54 -0000 1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/setup-test 17 Apr 2007 01:02:08 -0000 1.1
+++ test/setup-test 25 Jul 2008 00:11:54 -0000 1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/tests/folder/test-create 17 Apr 2007 01:02:08 -0000 1.1
+++ test/tests/folder/test-create 25 Jul 2008 00:11:54 -0000 1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/tests/folder/test-total 17 Apr 2007 01:02:08 -0000 1.1
+++ test/tests/folder/test-total 25 Jul 2008 00:11:54 -0000 1.2
@@ -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
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/tests/scan/test-scan 17 Apr 2007 01:02:08 -0000 1.1
+++ test/tests/scan/test-scan 25 Jul 2008 00:11:55 -0000 1.2
@@ -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: test/tests/pick/test-pick
===================================================================
RCS file: test/tests/pick/test-pick
diff -N test/tests/pick/test-pick
--- test/tests/pick/test-pick 17 Apr 2007 01:02:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Nmh-commits] nmh ChangeLog test/runtest test/setup-test test...,
Josh Bressers <=