qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r891395 - in /qpid/trunk/qpid/cpp/src: qpid/cluster/WatchDogPlugin.cpp tests/test_watchdog
Date Wed, 16 Dec 2009 19:31:21 GMT
Author: aconway
Date: Wed Dec 16 19:31:20 2009
New Revision: 891395

URL: http://svn.apache.org/viewvc?rev=891395&view=rev
Log:
QPID-2282: test_watchdog failing due to incorrect use of env. vars

Modified:
    qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
    qpid/trunk/qpid/cpp/src/tests/test_watchdog

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp?rev=891395&r1=891394&r2=891395&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp Wed Dec 16 19:31:20 2009
@@ -113,7 +113,7 @@
   protected:
 
     void child() {              // Child of fork
-        const char* watchdog = ::getenv("QPID_WATCHDOG_EXE"); // For use in tests
+        const char* watchdog = ::getenv("QPID_WATCHDOG_EXEC"); // For use in tests
         if (!watchdog) watchdog=QPID_EXEC_DIR "/qpidd_watchdog";
         std::string interval = boost::lexical_cast<std::string>(settings.interval);
         ::execl(watchdog, watchdog, interval.c_str(), NULL);

Modified: qpid/trunk/qpid/cpp/src/tests/test_watchdog
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_watchdog?rev=891395&r1=891394&r2=891395&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_watchdog (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_watchdog Wed Dec 16 19:31:20 2009
@@ -21,6 +21,7 @@
 
 # Tests for the watchdog plug-in
 
+source ./test_env.sh
 # Start a broker with  watchdog, freeze it with kill -STOP, verify that it is killed.
 PORT=`$QPIDD_EXEC -dp0 --no-data-dir --auth=no --no-module-dir --load-module $WATCHDOG_LIB
--log-to-file=qpidd_watchdog.log --watchdog-interval 1` || exit 1
 PID=`$QPIDD_EXEC --no-module-dir -cp $PORT` || exit 1



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message