Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 49621 invoked from network); 16 Dec 2009 19:31:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Dec 2009 19:31:45 -0000 Received: (qmail 93036 invoked by uid 500); 16 Dec 2009 19:31:45 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 93006 invoked by uid 500); 16 Dec 2009 19:31:44 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 92997 invoked by uid 99); 16 Dec 2009 19:31:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 19:31:44 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Dec 2009 19:31:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C147A23889D7; Wed, 16 Dec 2009 19:31:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@qpid.apache.org From: aconway@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091216193121.C147A23889D7@eris.apache.org> 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(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