Update of /home/cvsd/slony1/slony1-engine/tests
In directory main.slony.info:/tmp/cvs-serv28100/tests

Modified Files:
	run_test.sh 
Log Message:
Allow setting TMPDIR to indicate a path where log files for the test will
be placed.  As suggested by Nirbhay Choubey <Nirbhay.Choubey at Sun.COM>


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** run_test.sh	9 Jan 2008 20:47:48 -0000	1.20
--- run_test.sh	7 Apr 2008 20:47:48 -0000	1.21
***************
*** 256,260 ****
    	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occured trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
--- 256,260 ----
    	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occurred trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
***************
*** 716,728 ****
  }
  
  case `uname` in
    SunOS|AIX|MINGW32*)
!         for i in /tmp /usr/tmp /var/tmp; do
!       if [ -d $i ]; then
!         tmpdir=$i
!         break
!       fi
!     done
!     if [ -z $tmpdir ]; then
         err 3 "unable to create temp dir"
         exit
--- 716,734 ----
  }
  
+ TMPDIR=${TMPDIR:-"/tmp"}    # Consider either a default value, or /tmp
+ if [ -d ${TMPDIR} ]; then
+     T_TMPDIR=${TMPDIR}
+ else
+     for i in /tmp /usr/tmp /var/tmp; do
+ 	if [ -d ${i} ]; then
+ 	    TMPDIR=$i
+ 	    break
+ 	fi
+     done
+ fi
+ 
  case `uname` in
    SunOS|AIX|MINGW32*)
!     if [ -z $TMPDIR ]; then
         err 3 "unable to create temp dir"
         exit
***************
*** 733,742 ****
      rstring=slony-regress.$rstring
      
!     mkdir $tmpdir/$rstring
      retcode=$?
      if [ $retcode -ne 0 ]; then
        err $retcode "unable to create temp dir"
      else
!       mktmp=$tmpdir/$rstring
      fi
    ;;
--- 739,748 ----
      rstring=slony-regress.$rstring
      
!     mkdir ${TMPDIR}/$rstring
      retcode=$?
      if [ $retcode -ne 0 ]; then
        err $retcode "unable to create temp dir"
      else
!       mktmp=${TMPDIR}/$rstring
      fi
    ;;
***************
*** 744,748 ****
      mktmp=`mktemp -d -t slony-regress.XXXXXX`
      if [ $MY_MKTEMP_IS_DECREPIT ] ; then
!         mktmp=`mktemp -d /tmp/slony-regress.XXXXXX`
      fi
      if [ ! -d $mktmp ]; then
--- 750,754 ----
      mktmp=`mktemp -d -t slony-regress.XXXXXX`
      if [ $MY_MKTEMP_IS_DECREPIT ] ; then
!         mktmp=`mktemp -d ${TMPDIR}/slony-regress.XXXXXX`
      fi
      if [ ! -d $mktmp ]; then
***************
*** 758,762 ****
  esac
  
! 
  
  . $testname/generate_dml.sh
--- 764,768 ----
  esac
  
! echo ${testname} > ${mktmp}/TestName
  
  . $testname/generate_dml.sh
***************
*** 812,815 ****
  gen_testinfo
  drop_databases
! cleanup
! 
--- 818,820 ----
  gen_testinfo
  drop_databases
! cleanup
\ No newline at end of file