svn commit: r557793 - in /incubator/qpid/trunk/qpid/cpp/src/tests: start_broker stop_broker

[ac...@apache.org]

Author: aconway
Date: Thu Jul 19 15:20:12 2007
New Revision: 557793

URL: http://svn.apache.org/viewvc?view=rev&rev=557793
Log:

	* src/tests/start_broker, stop_broker:
	 - Fix bug: tripping over old log files.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
    incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_broker?view=diff&rev=557793&r1=557792&r2=557793
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_broker Thu Jul 19 15:20:12 2007
@@ -1,3 +1,4 @@
 #!/bin/sh
+rm -f qpidd.vglog qpidd.log
 test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --"
 exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log.output qpidd.log > qpidd.port

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker?view=diff&rev=557793&r1=557792&r2=557793
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/stop_broker Thu Jul 19 15:20:12 2007
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Stop the broker, check for errors.
 # 
-source `dirname $0`/vg_check
 export QPID_PORT=`cat qpidd.port`
 rm -f qpidd.port
 
@@ -16,6 +15,9 @@
 }
 
 # Check valgrind log.
-vg_check qpidd.vglog
+if test -n "$VALGRIND"; then
+    source `dirname $0`/vg_check
+    vg_check qpidd.vglog
+fi
 
 exit $ERROR