Updated test run scripts; working on improving the lock handling.

 - Legacy-Id: 796

Author: levkowetz

test/run

@@ -3,17 +3,23 @@
 program=${0##*/}
 progdir=${0%/*}
 
+. $progdir/shell-utils
+
 cd $progdir/..				# now at trunk/
 
-test/test-setup			# create a patched django for test purposes, and more
+pidfile=$(test/test-setup)		# create a patched django for test purposes, and more
+[ "$pidfile" ] || die "Didn't get a pidfile name"
 
 test/run-pyflakes ietf
 
 # Trap keyboard interrupt to ensure the test/teardown is run if we interrupt the tests
 trap 'echo "$program($LINENO): Caught Interrupt"' INT 
 
 # run tests with our patched django
-PYTHONPATH=test:test/lib URLPREFIX="$*" python ietf/manage.py test
+PYTHONPATH=test:test/lib URLPREFIX="$*" python ietf/manage.py test &
+pid=$!
+echo $pid > $pidfile
+wait $pid
 
 # reset keyboard interrupt trap
 trap INT

test/shell-utils

@@ -6,11 +6,15 @@
 
 [ "$program" ] || program=${0##*/}
 
+function die() { 
+	echo "$program: Error: $*" 1>&2; 
+	exit 2
+}
+
 function err() { 
 	echo "$program: Error: $*" 1>&2; 
 	exit 2
 }
-alias die='err'
 
 function warn() { 
 	echo "$program: Warning: $*" 1>&2; 

test/test-setup

@@ -66,18 +66,17 @@ while true; do
 	echo "$$" > $PIDFILE
 	chmod a+rwx $LOCKDIR
 	chmod a+rw $PIDFILE
+	echo $PIDFILE			# tell caller about the pidfile
 	break
     else
 	pid=$(< $PIDFILE )
 	[ "$pid" ] || die "Couldn't read pidfile '$PIDFILE'"
 	if kill -0 $pid; then
-	    echo "Pidfile for process $pid exists, and process is running. Sleeping."
+	    say "Pidfile for process $pid exists, and process is running. Sleeping."
 	    sleep 10
 	else
-	    echo "Pidfile for process $pid exists, but process isn't running."
-	    echo "Removing lock and old pid file $pidfile."
-	    rm -rf $LOCKDIR
-	    break 
+	    say "Pidfile for process $pid exists, but process doesn't seem to be running."
+	    die "Remove lockdir $LOCKDIR and old pid file $pidfile."
 	fi
     fi
 done