[Nmh-commits] nmh ChangeLog test/setup-test

[Eric Gillespie]

CVSROOT:        /sources/nmh
Module name:    nmh
Changes by:     Eric Gillespie <epg>    08/08/14 19:47:29

Modified files:
        .              : ChangeLog 
        test           : setup-test 

Log message:
                * test/setup-test: Don't run autogen.sh unless needed.  Build 
in a
                blddir under the temporary directory so as not to interfere with
                whatever the developer may be doing in the source directory.
                If the temporary directory already exists, rebuild and install 
it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.295&r2=1.296
http://cvs.savannah.gnu.org/viewcvs/nmh/test/setup-test?cvsroot=nmh&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/nmh/nmh/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- ChangeLog   14 Aug 2008 01:50:45 -0000      1.295
+++ ChangeLog   14 Aug 2008 19:47:29 -0000      1.296
@@ -1,3 +1,10 @@
+2008-08-14  Eric Gillespie  <address@hidden>
+
+       * test/setup-test: Don't run autogen.sh unless needed.  Build in a
+       blddir under the temporary directory so as not to interfere with
+       whatever the developer may be doing in the source directory.
+       If the temporary directory already exists, rebuild and install it.
+
 2008-08-13  Eric Gillespie  <address@hidden>
 
        * sbr/ambigsw.c: Send print_sw output to stderr.  This avoids

Index: test/setup-test
===================================================================
RCS file: /sources/nmh/nmh/test/setup-test,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/setup-test     12 Aug 2008 18:04:30 -0000      1.5
+++ test/setup-test     14 Aug 2008 19:47:29 -0000      1.6
@@ -2,13 +2,23 @@
 
 set -e
 
+if TEMPDIR=`cat test-temp-dir 2> /dev/null` \
+   && [ -e $TEMPDIR/bld/Makefile ]; then
+    (cd $TEMPDIR/bld && make all install)
+    exit
+fi
+
 TEMPDIR=`mktemp -d /tmp/nmh-test-XXXXXXXX`
 echo $TEMPDIR > test-temp-dir
 
 cd ..
-./autogen.sh
-./configure --prefix=$TEMPDIR --with-locking=fcntl --enable-debug
-make clean
+if ! [ -e configure ]; then
+    ./autogen.sh
+fi
+srcdir=$PWD
+mkdir $TEMPDIR/bld
+cd $TEMPDIR/bld
+$srcdir/configure --prefix=$TEMPDIR --with-locking=fcntl --enable-debug
 make install
 
 echo "Path: $TEMPDIR/Mail" > $TEMPDIR/mh_profile